diff --git a/STATUS.txt b/STATUS.txt
index 812886540..11457dc44 100644
--- a/STATUS.txt
+++ b/STATUS.txt
@@ -1,3 +1,5 @@
+SiteGraphTest
+
 WEBWORK2 INCUBATION STATUS
 
 The current version of this file can be found at: 
diff --git a/action/pom.xml b/action/pom.xml
new file mode 100644
index 000000000..3470756eb
--- /dev/null
+++ b/action/pom.xml
@@ -0,0 +1,425 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>project</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>action</artifactId>
+    <packaging>jar</packaging>
+    <name>Struts Action Framework 2.0</name>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
+        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
+        <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
+    </scm>
+    <profiles>
+        <profile>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <!-- should have the org.w3c.dom dependency here -->
+            </dependencies>
+        </profile>
+    </profiles>
+    <repositories>
+        <repository>
+            <id>apache</id>
+            <name>apache</name>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <url>http://cvs.apache.org/repository</url>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/TestBean.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!-- unreferenced dependencies:
+             * clover, mockobjects, xdoclet : only needed for build
+             * cewolf : only used in demos
+             * quickstart : because i'm lazy, and because it's unlikely to be needed to build a
+                            project using ww
+             * w3c.dom : needed for the xslt : this is all included in jdk1.5
+                         - classes missing in jdk1.4 are org.w3c.dom.TypeInfo,
+                           org.w3c.dom.UserDataHandler, org.w3c.dom.DOMConfiguration
+                         - this should be configurable with <profiles>
+         -->
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>xwork</artifactId>
+            <version>1.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>xwork-tiger</artifactId>
+            <version>1.2-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Ajax -->
+        <dependency>
+            <groupId>dwr</groupId>
+            <artifactId>dwr</artifactId>
+            <version>1.1-beta-3</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Velocity -->
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>velocity-tools</groupId>
+            <artifactId>velocity-tools</artifactId>
+            <version>1.1</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- File upload -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.1</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>servlets.com</groupId>
+            <artifactId>cos</artifactId>
+            <version>05Nov2002</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>opensymphony</groupId>
+            <artifactId>pell-multipart</artifactId>
+            <!-- webwork's ivy dependency reports mentions v1.19 ? -->
+            <version>2.1.5</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Sitemesh -->
+        <dependency>
+            <!-- group should be com.opensymphony -->
+            <groupId>opensymphony</groupId>
+            <artifactId>sitemesh</artifactId>
+            <version>2.2.1</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Quickstart -->
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+            <version>5.1.4</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>eclipse</groupId>
+            <artifactId>jdtcore</artifactId>
+            <version>3.1.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Jasper -->
+        <dependency>
+            <groupId>jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>1.1.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- JFree -->
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jfreechart</artifactId>
+            <version>1.0.0</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>gnujaxp</groupId>
+                    <artifactId>gnujaxp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Tiles -->
+        <dependency>
+            <groupId>org.apache.struts.tiles</groupId>
+            <artifactId>tiles-core</artifactId>
+            <version>0.2-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.7</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Portlet -->
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>1.0.1-rc4</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Plexus -->
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-container-default</artifactId>
+            <version>1.0-alpha-10-SNAPSHOT</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Pico -->
+        <dependency>
+            <groupId>picocontainer</groupId>
+            <artifactId>picocontainer</artifactId>
+            <version>1.2</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>picocontainer</groupId>
+            <artifactId>picocontainer-gems</artifactId>
+            <version>1.2</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>nanocontainer</groupId>
+            <artifactId>nanocontainer</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>nanocontainer</groupId>
+            <artifactId>nanocontainer-nanowar</artifactId>
+            <version>1.0</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>1.2.6</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>1.2.6</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>1.2.6</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>1.2.6</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-mock</artifactId>
+            <version>1.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- nanocontainer override -->
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>1.1.3.4-RC8</version>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>compile</scope>
+            <!-- has to be compile for WebWorkTestCase, which is part of the base package so others can write unit tests -->
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>1.2_Java1.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock-cglib</artifactId>
+            <version>1.0.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-core</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-jdk1.3</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-alt-jdk1.3</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/src/etc/README.txt b/action/src/main/etc/README.txt
similarity index 100%
rename from src/etc/README.txt
rename to action/src/main/etc/README.txt
diff --git a/src/etc/taglib-settings.xml b/action/src/main/etc/taglib-settings.xml
similarity index 100%
rename from src/etc/taglib-settings.xml
rename to action/src/main/etc/taglib-settings.xml
diff --git a/src/java/org/apache/struts/action2/Main.java b/action/src/main/java/org/apache/struts/action2/Main.java
similarity index 100%
rename from src/java/org/apache/struts/action2/Main.java
rename to action/src/main/java/org/apache/struts/action2/Main.java
diff --git a/src/java/org/apache/struts/action2/RequestUtils.java b/action/src/main/java/org/apache/struts/action2/RequestUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/RequestUtils.java
rename to action/src/main/java/org/apache/struts/action2/RequestUtils.java
diff --git a/src/java/org/apache/struts/action2/ServletActionContext.java b/action/src/main/java/org/apache/struts/action2/ServletActionContext.java
similarity index 100%
rename from src/java/org/apache/struts/action2/ServletActionContext.java
rename to action/src/main/java/org/apache/struts/action2/ServletActionContext.java
diff --git a/src/java/org/apache/struts/action2/StrutsConstants.java b/action/src/main/java/org/apache/struts/action2/StrutsConstants.java
similarity index 100%
rename from src/java/org/apache/struts/action2/StrutsConstants.java
rename to action/src/main/java/org/apache/struts/action2/StrutsConstants.java
diff --git a/src/java/org/apache/struts/action2/StrutsStatics.java b/action/src/main/java/org/apache/struts/action2/StrutsStatics.java
similarity index 100%
rename from src/java/org/apache/struts/action2/StrutsStatics.java
rename to action/src/main/java/org/apache/struts/action2/StrutsStatics.java
diff --git a/src/java/org/apache/struts/action2/StrutsTestCase.java b/action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
similarity index 100%
rename from src/java/org/apache/struts/action2/StrutsTestCase.java
rename to action/src/main/java/org/apache/struts/action2/StrutsTestCase.java
diff --git a/src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java b/action/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
rename to action/src/main/java/org/apache/struts/action2/components/AbstractRichtexteditorConnector.java
diff --git a/src/java/org/apache/struts/action2/components/ActionComponent.java b/action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ActionComponent.java
rename to action/src/main/java/org/apache/struts/action2/components/ActionComponent.java
diff --git a/src/java/org/apache/struts/action2/components/ActionError.java b/action/src/main/java/org/apache/struts/action2/components/ActionError.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ActionError.java
rename to action/src/main/java/org/apache/struts/action2/components/ActionError.java
diff --git a/src/java/org/apache/struts/action2/components/ActionMessage.java b/action/src/main/java/org/apache/struts/action2/components/ActionMessage.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ActionMessage.java
rename to action/src/main/java/org/apache/struts/action2/components/ActionMessage.java
diff --git a/src/java/org/apache/struts/action2/components/Anchor.java b/action/src/main/java/org/apache/struts/action2/components/Anchor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Anchor.java
rename to action/src/main/java/org/apache/struts/action2/components/Anchor.java
diff --git a/src/java/org/apache/struts/action2/components/AppendIterator.java b/action/src/main/java/org/apache/struts/action2/components/AppendIterator.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/AppendIterator.java
rename to action/src/main/java/org/apache/struts/action2/components/AppendIterator.java
diff --git a/src/java/org/apache/struts/action2/components/Bean.java b/action/src/main/java/org/apache/struts/action2/components/Bean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Bean.java
rename to action/src/main/java/org/apache/struts/action2/components/Bean.java
diff --git a/src/java/org/apache/struts/action2/components/Checkbox.java b/action/src/main/java/org/apache/struts/action2/components/Checkbox.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Checkbox.java
rename to action/src/main/java/org/apache/struts/action2/components/Checkbox.java
diff --git a/src/java/org/apache/struts/action2/components/CheckboxList.java b/action/src/main/java/org/apache/struts/action2/components/CheckboxList.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/CheckboxList.java
rename to action/src/main/java/org/apache/struts/action2/components/CheckboxList.java
diff --git a/src/java/org/apache/struts/action2/components/ClosingUIBean.java b/action/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ClosingUIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/ClosingUIBean.java
diff --git a/src/java/org/apache/struts/action2/components/ComboBox.java b/action/src/main/java/org/apache/struts/action2/components/ComboBox.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ComboBox.java
rename to action/src/main/java/org/apache/struts/action2/components/ComboBox.java
diff --git a/src/java/org/apache/struts/action2/components/Component.java b/action/src/main/java/org/apache/struts/action2/components/Component.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Component.java
rename to action/src/main/java/org/apache/struts/action2/components/Component.java
diff --git a/src/java/org/apache/struts/action2/components/Date.java b/action/src/main/java/org/apache/struts/action2/components/Date.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Date.java
rename to action/src/main/java/org/apache/struts/action2/components/Date.java
diff --git a/src/java/org/apache/struts/action2/components/DatePicker.java b/action/src/main/java/org/apache/struts/action2/components/DatePicker.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/DatePicker.java
rename to action/src/main/java/org/apache/struts/action2/components/DatePicker.java
diff --git a/src/java/org/apache/struts/action2/components/Debug.java b/action/src/main/java/org/apache/struts/action2/components/Debug.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Debug.java
rename to action/src/main/java/org/apache/struts/action2/components/Debug.java
diff --git a/src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java b/action/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
rename to action/src/main/java/org/apache/struts/action2/components/DefaultRichtexteditorConnector.java
diff --git a/src/java/org/apache/struts/action2/components/Div.java b/action/src/main/java/org/apache/struts/action2/components/Div.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Div.java
rename to action/src/main/java/org/apache/struts/action2/components/Div.java
diff --git a/src/java/org/apache/struts/action2/components/DoubleListUIBean.java b/action/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/DoubleListUIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/DoubleListUIBean.java
diff --git a/src/java/org/apache/struts/action2/components/DoubleSelect.java b/action/src/main/java/org/apache/struts/action2/components/DoubleSelect.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/DoubleSelect.java
rename to action/src/main/java/org/apache/struts/action2/components/DoubleSelect.java
diff --git a/src/java/org/apache/struts/action2/components/Else.java b/action/src/main/java/org/apache/struts/action2/components/Else.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Else.java
rename to action/src/main/java/org/apache/struts/action2/components/Else.java
diff --git a/src/java/org/apache/struts/action2/components/ElseIf.java b/action/src/main/java/org/apache/struts/action2/components/ElseIf.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ElseIf.java
rename to action/src/main/java/org/apache/struts/action2/components/ElseIf.java
diff --git a/src/java/org/apache/struts/action2/components/FieldError.java b/action/src/main/java/org/apache/struts/action2/components/FieldError.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/FieldError.java
rename to action/src/main/java/org/apache/struts/action2/components/FieldError.java
diff --git a/src/java/org/apache/struts/action2/components/File.java b/action/src/main/java/org/apache/struts/action2/components/File.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/File.java
rename to action/src/main/java/org/apache/struts/action2/components/File.java
diff --git a/src/java/org/apache/struts/action2/components/Form.java b/action/src/main/java/org/apache/struts/action2/components/Form.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Form.java
rename to action/src/main/java/org/apache/struts/action2/components/Form.java
diff --git a/src/java/org/apache/struts/action2/components/FormButton.java b/action/src/main/java/org/apache/struts/action2/components/FormButton.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/FormButton.java
rename to action/src/main/java/org/apache/struts/action2/components/FormButton.java
diff --git a/src/java/org/apache/struts/action2/components/GenericUIBean.java b/action/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/GenericUIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/GenericUIBean.java
diff --git a/src/java/org/apache/struts/action2/components/Head.java b/action/src/main/java/org/apache/struts/action2/components/Head.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Head.java
rename to action/src/main/java/org/apache/struts/action2/components/Head.java
diff --git a/src/java/org/apache/struts/action2/components/Hidden.java b/action/src/main/java/org/apache/struts/action2/components/Hidden.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Hidden.java
rename to action/src/main/java/org/apache/struts/action2/components/Hidden.java
diff --git a/src/java/org/apache/struts/action2/components/I18n.java b/action/src/main/java/org/apache/struts/action2/components/I18n.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/I18n.java
rename to action/src/main/java/org/apache/struts/action2/components/I18n.java
diff --git a/src/java/org/apache/struts/action2/components/If.java b/action/src/main/java/org/apache/struts/action2/components/If.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/If.java
rename to action/src/main/java/org/apache/struts/action2/components/If.java
diff --git a/src/java/org/apache/struts/action2/components/Include.java b/action/src/main/java/org/apache/struts/action2/components/Include.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Include.java
rename to action/src/main/java/org/apache/struts/action2/components/Include.java
diff --git a/src/java/org/apache/struts/action2/components/IteratorComponent.java b/action/src/main/java/org/apache/struts/action2/components/IteratorComponent.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/IteratorComponent.java
rename to action/src/main/java/org/apache/struts/action2/components/IteratorComponent.java
diff --git a/src/java/org/apache/struts/action2/components/Label.java b/action/src/main/java/org/apache/struts/action2/components/Label.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Label.java
rename to action/src/main/java/org/apache/struts/action2/components/Label.java
diff --git a/src/java/org/apache/struts/action2/components/ListUIBean.java b/action/src/main/java/org/apache/struts/action2/components/ListUIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/ListUIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/ListUIBean.java
diff --git a/src/java/org/apache/struts/action2/components/MergeIterator.java b/action/src/main/java/org/apache/struts/action2/components/MergeIterator.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/MergeIterator.java
rename to action/src/main/java/org/apache/struts/action2/components/MergeIterator.java
diff --git a/src/java/org/apache/struts/action2/components/OptionTransferSelect.java b/action/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/OptionTransferSelect.java
rename to action/src/main/java/org/apache/struts/action2/components/OptionTransferSelect.java
diff --git a/src/java/org/apache/struts/action2/components/Panel.java b/action/src/main/java/org/apache/struts/action2/components/Panel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Panel.java
rename to action/src/main/java/org/apache/struts/action2/components/Panel.java
diff --git a/src/java/org/apache/struts/action2/components/Param.java b/action/src/main/java/org/apache/struts/action2/components/Param.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Param.java
rename to action/src/main/java/org/apache/struts/action2/components/Param.java
diff --git a/src/java/org/apache/struts/action2/components/Password.java b/action/src/main/java/org/apache/struts/action2/components/Password.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Password.java
rename to action/src/main/java/org/apache/struts/action2/components/Password.java
diff --git a/src/java/org/apache/struts/action2/components/Property.java b/action/src/main/java/org/apache/struts/action2/components/Property.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Property.java
rename to action/src/main/java/org/apache/struts/action2/components/Property.java
diff --git a/src/java/org/apache/struts/action2/components/Push.java b/action/src/main/java/org/apache/struts/action2/components/Push.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Push.java
rename to action/src/main/java/org/apache/struts/action2/components/Push.java
diff --git a/src/java/org/apache/struts/action2/components/Radio.java b/action/src/main/java/org/apache/struts/action2/components/Radio.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Radio.java
rename to action/src/main/java/org/apache/struts/action2/components/Radio.java
diff --git a/src/java/org/apache/struts/action2/components/RemoteCallUIBean.java b/action/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/RemoteCallUIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/RemoteCallUIBean.java
diff --git a/src/java/org/apache/struts/action2/components/Reset.java b/action/src/main/java/org/apache/struts/action2/components/Reset.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Reset.java
rename to action/src/main/java/org/apache/struts/action2/components/Reset.java
diff --git a/src/java/org/apache/struts/action2/components/RichTextEditor.java b/action/src/main/java/org/apache/struts/action2/components/RichTextEditor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/RichTextEditor.java
rename to action/src/main/java/org/apache/struts/action2/components/RichTextEditor.java
diff --git a/src/java/org/apache/struts/action2/components/Select.java b/action/src/main/java/org/apache/struts/action2/components/Select.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Select.java
rename to action/src/main/java/org/apache/struts/action2/components/Select.java
diff --git a/src/java/org/apache/struts/action2/components/Set.java b/action/src/main/java/org/apache/struts/action2/components/Set.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Set.java
rename to action/src/main/java/org/apache/struts/action2/components/Set.java
diff --git a/src/java/org/apache/struts/action2/components/Submit.java b/action/src/main/java/org/apache/struts/action2/components/Submit.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Submit.java
rename to action/src/main/java/org/apache/struts/action2/components/Submit.java
diff --git a/src/java/org/apache/struts/action2/components/TabbedPanel.java b/action/src/main/java/org/apache/struts/action2/components/TabbedPanel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/TabbedPanel.java
rename to action/src/main/java/org/apache/struts/action2/components/TabbedPanel.java
diff --git a/src/java/org/apache/struts/action2/components/Text.java b/action/src/main/java/org/apache/struts/action2/components/Text.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Text.java
rename to action/src/main/java/org/apache/struts/action2/components/Text.java
diff --git a/src/java/org/apache/struts/action2/components/TextArea.java b/action/src/main/java/org/apache/struts/action2/components/TextArea.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/TextArea.java
rename to action/src/main/java/org/apache/struts/action2/components/TextArea.java
diff --git a/src/java/org/apache/struts/action2/components/TextField.java b/action/src/main/java/org/apache/struts/action2/components/TextField.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/TextField.java
rename to action/src/main/java/org/apache/struts/action2/components/TextField.java
diff --git a/src/java/org/apache/struts/action2/components/Token.java b/action/src/main/java/org/apache/struts/action2/components/Token.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Token.java
rename to action/src/main/java/org/apache/struts/action2/components/Token.java
diff --git a/src/java/org/apache/struts/action2/components/Tree.java b/action/src/main/java/org/apache/struts/action2/components/Tree.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/Tree.java
rename to action/src/main/java/org/apache/struts/action2/components/Tree.java
diff --git a/src/java/org/apache/struts/action2/components/TreeNode.java b/action/src/main/java/org/apache/struts/action2/components/TreeNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/TreeNode.java
rename to action/src/main/java/org/apache/struts/action2/components/TreeNode.java
diff --git a/src/java/org/apache/struts/action2/components/UIBean.java b/action/src/main/java/org/apache/struts/action2/components/UIBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/UIBean.java
rename to action/src/main/java/org/apache/struts/action2/components/UIBean.java
diff --git a/src/java/org/apache/struts/action2/components/URL.java b/action/src/main/java/org/apache/struts/action2/components/URL.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/URL.java
rename to action/src/main/java/org/apache/struts/action2/components/URL.java
diff --git a/src/java/org/apache/struts/action2/components/UpDownSelect.java b/action/src/main/java/org/apache/struts/action2/components/UpDownSelect.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/UpDownSelect.java
rename to action/src/main/java/org/apache/struts/action2/components/UpDownSelect.java
diff --git a/src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java b/action/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
rename to action/src/main/java/org/apache/struts/action2/components/table/AbstractFilterModel.java
diff --git a/src/java/org/apache/struts/action2/components/table/RenderFilterModel.java b/action/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/RenderFilterModel.java
rename to action/src/main/java/org/apache/struts/action2/components/table/RenderFilterModel.java
diff --git a/src/java/org/apache/struts/action2/components/table/SortFilterModel.java b/action/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/SortFilterModel.java
rename to action/src/main/java/org/apache/struts/action2/components/table/SortFilterModel.java
diff --git a/src/java/org/apache/struts/action2/components/table/SortableTableModel.java b/action/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/SortableTableModel.java
rename to action/src/main/java/org/apache/struts/action2/components/table/SortableTableModel.java
diff --git a/src/java/org/apache/struts/action2/components/table/WebTable.java b/action/src/main/java/org/apache/struts/action2/components/table/WebTable.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/WebTable.java
rename to action/src/main/java/org/apache/struts/action2/components/table/WebTable.java
diff --git a/src/java/org/apache/struts/action2/components/table/WebTableColumn.java b/action/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/WebTableColumn.java
rename to action/src/main/java/org/apache/struts/action2/components/table/WebTableColumn.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/AbstractCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/BooleanCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/CellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/DateCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/DefaultCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/FixedTextCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/LinkCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java b/action/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/NumericCellRenderer.java
diff --git a/src/java/org/apache/struts/action2/components/table/renderer/package.html b/action/src/main/java/org/apache/struts/action2/components/table/renderer/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/components/table/renderer/package.html
rename to action/src/main/java/org/apache/struts/action2/components/table/renderer/package.html
diff --git a/src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java b/action/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
rename to action/src/main/java/org/apache/struts/action2/components/template/BaseTemplateEngine.java
diff --git a/src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java b/action/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
rename to action/src/main/java/org/apache/struts/action2/components/template/FreemarkerTemplateEngine.java
diff --git a/src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java b/action/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
rename to action/src/main/java/org/apache/struts/action2/components/template/JspTemplateEngine.java
diff --git a/src/java/org/apache/struts/action2/components/template/Template.java b/action/src/main/java/org/apache/struts/action2/components/template/Template.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/Template.java
rename to action/src/main/java/org/apache/struts/action2/components/template/Template.java
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateEngine.java b/action/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/TemplateEngine.java
rename to action/src/main/java/org/apache/struts/action2/components/template/TemplateEngine.java
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java b/action/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
rename to action/src/main/java/org/apache/struts/action2/components/template/TemplateEngineManager.java
diff --git a/src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java b/action/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
rename to action/src/main/java/org/apache/struts/action2/components/template/TemplateRenderingContext.java
diff --git a/src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java b/action/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
similarity index 100%
rename from src/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
rename to action/src/main/java/org/apache/struts/action2/components/template/VelocityTemplateEngine.java
diff --git a/src/java/org/apache/struts/action2/config/Configuration.java b/action/src/main/java/org/apache/struts/action2/config/Configuration.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config/Configuration.java
rename to action/src/main/java/org/apache/struts/action2/config/Configuration.java
diff --git a/src/java/org/apache/struts/action2/config/DefaultConfiguration.java b/action/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config/DefaultConfiguration.java
rename to action/src/main/java/org/apache/struts/action2/config/DefaultConfiguration.java
diff --git a/src/java/org/apache/struts/action2/config/DelegatingConfiguration.java b/action/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config/DelegatingConfiguration.java
rename to action/src/main/java/org/apache/struts/action2/config/DelegatingConfiguration.java
diff --git a/src/java/org/apache/struts/action2/config/PropertiesConfiguration.java b/action/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config/PropertiesConfiguration.java
rename to action/src/main/java/org/apache/struts/action2/config/PropertiesConfiguration.java
diff --git a/src/java/org/apache/struts/action2/config/ServletContextSingleton.java b/action/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config/ServletContextSingleton.java
rename to action/src/main/java/org/apache/struts/action2/config/ServletContextSingleton.java
diff --git a/src/java/org/apache/struts/action2/config/package.html b/action/src/main/java/org/apache/struts/action2/config/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/config/package.html
rename to action/src/main/java/org/apache/struts/action2/config/package.html
diff --git a/src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java b/action/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
rename to action/src/main/java/org/apache/struts/action2/config_browser/ActionNamesAction.java
diff --git a/src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java b/action/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
rename to action/src/main/java/org/apache/struts/action2/config_browser/ConfigurationHelper.java
diff --git a/src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java b/action/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
rename to action/src/main/java/org/apache/struts/action2/config_browser/ListValidatorsAction.java
diff --git a/src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java b/action/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
rename to action/src/main/java/org/apache/struts/action2/config_browser/ShowConfigAction.java
diff --git a/src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java b/action/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
similarity index 100%
rename from src/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
rename to action/src/main/java/org/apache/struts/action2/config_browser/ShowValidatorAction.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ActionContextCleanUp.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ApplicationMap.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ApplicationMap.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ChartResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ChartResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ChartResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java b/action/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/DefaultActionSupport.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java b/action/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/DispatcherUtils.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java b/action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcher.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java b/action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/FilterDispatcherCompatWeblogic61.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/HttpHeaderResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/PlainTextResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/RequestMap.java b/action/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/RequestMap.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/RequestMap.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ServletActionRedirectResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcher.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ServletDispatcherResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/ServletRedirectResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/SessionMap.java b/action/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/SessionMap.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/SessionMap.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/StreamResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/StreamResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/StreamResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java b/action/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/StrutsRequestWrapper.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java b/action/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/StrutsResultSupport.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/VelocityResult.java b/action/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/VelocityResult.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/VelocityResult.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapper.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapperFactory.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/mapper/ActionMapping.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
similarity index 98%
rename from src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
index 5de839649..ffdf0b5a5 100644
--- a/src/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
+++ b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapper.java
@@ -280,8 +280,12 @@ public class DefaultActionMapper implements ActionMapper {
      */
     static List getExtensions() {
         String extensions = (String) Configuration.get(StrutsConstants.STRUTS_ACTION_EXTENSION);
-       
-        if (extensions.equals("")) {
+
+        if (extensions == null) {
+            System.out.println(Configuration.getConfiguration().getClass());
+        }
+
+        if ("".equals(extensions)) {
         	return null;
         } else {
         	return Arrays.asList(extensions.split(","));        	
diff --git a/src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java b/action/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapper.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java b/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/multipart/JakartaMultiPartRequest.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java b/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequest.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java b/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/multipart/MultiPartRequestWrapper.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java b/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
rename to action/src/main/java/org/apache/struts/action2/dispatcher/multipart/PellMultiPartRequest.java
diff --git a/src/java/org/apache/struts/action2/dispatcher/multipart/package.html b/action/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/multipart/package.html
rename to action/src/main/java/org/apache/struts/action2/dispatcher/multipart/package.html
diff --git a/src/java/org/apache/struts/action2/dispatcher/package.html b/action/src/main/java/org/apache/struts/action2/dispatcher/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/dispatcher/package.html
rename to action/src/main/java/org/apache/struts/action2/dispatcher/package.html
diff --git a/src/java/org/apache/struts/action2/interceptor/ApplicationAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ApplicationAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ApplicationAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java b/action/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/BackgroundProcess.java
diff --git a/src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/CreateSessionInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/FileUploadInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/NoParameters.java b/action/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/NoParameters.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/NoParameters.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ParameterAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ParameterAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ParameterAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/PrincipalAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/PrincipalAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/PrincipalAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java b/action/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/PrincipalProxy.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ScopeInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ServletConfigInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ServletRequestAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/ServletResponseAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/SessionAware.java b/action/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/SessionAware.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/SessionAware.java
diff --git a/src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/TokenInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java b/action/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/debugging/DebuggingInterceptor.java
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java b/action/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
rename to action/src/main/java/org/apache/struts/action2/interceptor/debugging/PrettyPrintWriter.java
diff --git a/src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java b/action/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
rename to action/src/main/java/org/apache/struts/action2/lifecycle/ApplicationLifecycleListener.java
diff --git a/src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java b/action/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
rename to action/src/main/java/org/apache/struts/action2/lifecycle/LifecycleListener.java
diff --git a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java b/action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
rename to action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListener.java
diff --git a/src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java b/action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
similarity index 100%
rename from src/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
rename to action/src/main/java/org/apache/struts/action2/lifecycle/SessionLifecycleListenerCompatWeblogic61.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoActionInvocation.java b/action/src/main/java/org/apache/struts/action2/pico/PicoActionInvocation.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoActionInvocation.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoActionInvocation.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java b/action/src/main/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoActionProxyFactory.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java b/action/src/main/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoFilterDispatcher.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoObjectFactory.java b/action/src/main/java/org/apache/struts/action2/pico/PicoObjectFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoObjectFactory.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoObjectFactory.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java b/action/src/main/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoObjectFactoryFilter.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java b/action/src/main/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoServletDispatcher.java
diff --git a/src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java b/action/src/main/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java
rename to action/src/main/java/org/apache/struts/action2/pico/PicoStrutsServletDispatcher.java
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusFilter.java b/action/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/plexus/PlexusFilter.java
rename to action/src/main/java/org/apache/struts/action2/plexus/PlexusFilter.java
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java b/action/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
rename to action/src/main/java/org/apache/struts/action2/plexus/PlexusLifecycleListener.java
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java b/action/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
rename to action/src/main/java/org/apache/struts/action2/plexus/PlexusObjectFactory.java
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java b/action/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
similarity index 100%
rename from src/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
rename to action/src/main/java/org/apache/struts/action2/plexus/PlexusThreadLocal.java
diff --git a/src/java/org/apache/struts/action2/plexus/PlexusUtils.java b/action/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/plexus/PlexusUtils.java
rename to action/src/main/java/org/apache/struts/action2/plexus/PlexusUtils.java
diff --git a/src/java/org/apache/struts/action2/portlet/PortletActionConstants.java b/action/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/PortletActionConstants.java
rename to action/src/main/java/org/apache/struts/action2/portlet/PortletActionConstants.java
diff --git a/src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java b/action/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
rename to action/src/main/java/org/apache/struts/action2/portlet/PortletApplicationMap.java
diff --git a/src/java/org/apache/struts/action2/portlet/PortletRequestMap.java b/action/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/PortletRequestMap.java
rename to action/src/main/java/org/apache/struts/action2/portlet/PortletRequestMap.java
diff --git a/src/java/org/apache/struts/action2/portlet/PortletSessionMap.java b/action/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/PortletSessionMap.java
rename to action/src/main/java/org/apache/struts/action2/portlet/PortletSessionMap.java
diff --git a/src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java b/action/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
rename to action/src/main/java/org/apache/struts/action2/portlet/context/PortletActionContext.java
diff --git a/src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java b/action/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
rename to action/src/main/java/org/apache/struts/action2/portlet/context/PreparatorServlet.java
diff --git a/src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java b/action/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
rename to action/src/main/java/org/apache/struts/action2/portlet/context/ServletContextHolderListener.java
diff --git a/src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java b/action/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
rename to action/src/main/java/org/apache/struts/action2/portlet/dispatcher/DirectRenderFromEventAction.java
diff --git a/src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java b/action/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
rename to action/src/main/java/org/apache/struts/action2/portlet/dispatcher/Jsr168Dispatcher.java
diff --git a/src/java/org/apache/struts/action2/portlet/result/PortletResult.java b/action/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/result/PortletResult.java
rename to action/src/main/java/org/apache/struts/action2/portlet/result/PortletResult.java
diff --git a/src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java b/action/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
rename to action/src/main/java/org/apache/struts/action2/portlet/result/PortletVelocityResult.java
diff --git a/src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java b/action/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
rename to action/src/main/java/org/apache/struts/action2/portlet/util/PortletUrlHelper.java
diff --git a/src/java/org/apache/struts/action2/quickstart/Configuration.java b/action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/Configuration.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/Configuration.java
diff --git a/src/java/org/apache/struts/action2/quickstart/JettyServer.java b/action/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/JettyServer.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/JettyServer.java
diff --git a/src/java/org/apache/struts/action2/quickstart/Mapping.java b/action/src/main/java/org/apache/struts/action2/quickstart/Mapping.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/Mapping.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/Mapping.java
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java b/action/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/MultiDirClassLoader.java
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiDirResource.java b/action/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/MultiDirResource.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/MultiDirResource.java
diff --git a/src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java b/action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/MultiWebApplicationContext.java
diff --git a/src/java/org/apache/struts/action2/quickstart/QuickStart.java b/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
similarity index 100%
rename from src/java/org/apache/struts/action2/quickstart/QuickStart.java
rename to action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/SiteGraph.java b/action/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/SiteGraph.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/SiteGraph.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java b/action/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/XWorkConfigRetriever.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java b/action/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/collectors/ArbitraryXMLConfigurationProvider.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/FileBasedView.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/FreeMarkerView.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/JspView.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/JspView.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/JspView.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/Target.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/Target.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/Target.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/VelocityView.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/entities/View.java b/action/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/entities/View.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/entities/View.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/ActionNode.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Graph.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/Graph.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/Graph.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/IndentWriter.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Link.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/Link.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/Link.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/Render.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/Render.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/Render.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/SiteGraphNode.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/SubGraph.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java b/action/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/model/ViewNode.java
diff --git a/src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java b/action/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
rename to action/src/main/java/org/apache/struts/action2/sitegraph/renderers/DOTRenderer.java
diff --git a/src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java b/action/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
rename to action/src/main/java/org/apache/struts/action2/sitemesh/FreeMarkerPageFilter.java
diff --git a/src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java b/action/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
rename to action/src/main/java/org/apache/struts/action2/sitemesh/TemplatePageFilter.java
diff --git a/src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java b/action/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
rename to action/src/main/java/org/apache/struts/action2/sitemesh/VelocityPageFilter.java
diff --git a/src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java b/action/src/main/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
rename to action/src/main/java/org/apache/struts/action2/spring/SessionContextSpringProxyableObjectFactory.java
diff --git a/src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java b/action/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
rename to action/src/main/java/org/apache/struts/action2/spring/StrutsSpringObjectFactory.java
diff --git a/src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java b/action/src/main/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
rename to action/src/main/java/org/apache/struts/action2/spring/interceptor/SessionContextAutowiringInterceptor.java
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java b/action/src/main/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
rename to action/src/main/java/org/apache/struts/action2/spring/lifecycle/ApplicationContextSessionListener.java
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java b/action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
rename to action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringExternalReferenceResolverSetupListener.java
diff --git a/src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java b/action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
rename to action/src/main/java/org/apache/struts/action2/spring/lifecycle/SpringObjectFactoryListener.java
diff --git a/src/java/org/apache/struts/action2/util/AppendIteratorFilter.java b/action/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/AppendIteratorFilter.java
rename to action/src/main/java/org/apache/struts/action2/util/AppendIteratorFilter.java
diff --git a/src/java/org/apache/struts/action2/util/AttributeMap.java b/action/src/main/java/org/apache/struts/action2/util/AttributeMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/AttributeMap.java
rename to action/src/main/java/org/apache/struts/action2/util/AttributeMap.java
diff --git a/src/java/org/apache/struts/action2/util/ClassLoaderUtils.java b/action/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ClassLoaderUtils.java
rename to action/src/main/java/org/apache/struts/action2/util/ClassLoaderUtils.java
diff --git a/src/java/org/apache/struts/action2/util/ContainUtil.java b/action/src/main/java/org/apache/struts/action2/util/ContainUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ContainUtil.java
rename to action/src/main/java/org/apache/struts/action2/util/ContainUtil.java
diff --git a/src/java/org/apache/struts/action2/util/Counter.java b/action/src/main/java/org/apache/struts/action2/util/Counter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/Counter.java
rename to action/src/main/java/org/apache/struts/action2/util/Counter.java
diff --git a/src/java/org/apache/struts/action2/util/DateFormatter.java b/action/src/main/java/org/apache/struts/action2/util/DateFormatter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/DateFormatter.java
rename to action/src/main/java/org/apache/struts/action2/util/DateFormatter.java
diff --git a/src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java b/action/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
rename to action/src/main/java/org/apache/struts/action2/util/FastByteArrayOutputStream.java
diff --git a/src/java/org/apache/struts/action2/util/InvocationSessionStore.java b/action/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/InvocationSessionStore.java
rename to action/src/main/java/org/apache/struts/action2/util/InvocationSessionStore.java
diff --git a/src/java/org/apache/struts/action2/util/IteratorFilterSupport.java b/action/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/IteratorFilterSupport.java
rename to action/src/main/java/org/apache/struts/action2/util/IteratorFilterSupport.java
diff --git a/src/java/org/apache/struts/action2/util/IteratorGenerator.java b/action/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/IteratorGenerator.java
rename to action/src/main/java/org/apache/struts/action2/util/IteratorGenerator.java
diff --git a/src/java/org/apache/struts/action2/util/ListEntry.java b/action/src/main/java/org/apache/struts/action2/util/ListEntry.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ListEntry.java
rename to action/src/main/java/org/apache/struts/action2/util/ListEntry.java
diff --git a/src/java/org/apache/struts/action2/util/MakeIterator.java b/action/src/main/java/org/apache/struts/action2/util/MakeIterator.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/MakeIterator.java
rename to action/src/main/java/org/apache/struts/action2/util/MakeIterator.java
diff --git a/src/java/org/apache/struts/action2/util/MergeIteratorFilter.java b/action/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/MergeIteratorFilter.java
rename to action/src/main/java/org/apache/struts/action2/util/MergeIteratorFilter.java
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java b/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
rename to action/src/main/java/org/apache/struts/action2/util/ObjectFactoryDestroyable.java
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java b/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
rename to action/src/main/java/org/apache/struts/action2/util/ObjectFactoryInitializable.java
diff --git a/src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java b/action/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
rename to action/src/main/java/org/apache/struts/action2/util/ObjectFactoryLifecycle.java
diff --git a/src/java/org/apache/struts/action2/util/PrefixTrie.java b/action/src/main/java/org/apache/struts/action2/util/PrefixTrie.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/PrefixTrie.java
rename to action/src/main/java/org/apache/struts/action2/util/PrefixTrie.java
diff --git a/src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java b/action/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
rename to action/src/main/java/org/apache/struts/action2/util/ResolverSetupServletContextListener.java
diff --git a/src/java/org/apache/struts/action2/util/ServletContextAware.java b/action/src/main/java/org/apache/struts/action2/util/ServletContextAware.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/ServletContextAware.java
rename to action/src/main/java/org/apache/struts/action2/util/ServletContextAware.java
diff --git a/src/java/org/apache/struts/action2/util/SortIteratorFilter.java b/action/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/SortIteratorFilter.java
rename to action/src/main/java/org/apache/struts/action2/util/SortIteratorFilter.java
diff --git a/src/java/org/apache/struts/action2/util/Sorter.java b/action/src/main/java/org/apache/struts/action2/util/Sorter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/Sorter.java
rename to action/src/main/java/org/apache/struts/action2/util/Sorter.java
diff --git a/src/java/org/apache/struts/action2/util/StrutsTypeConverter.java b/action/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/StrutsTypeConverter.java
rename to action/src/main/java/org/apache/struts/action2/util/StrutsTypeConverter.java
diff --git a/src/java/org/apache/struts/action2/util/StrutsUtil.java b/action/src/main/java/org/apache/struts/action2/util/StrutsUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/StrutsUtil.java
rename to action/src/main/java/org/apache/struts/action2/util/StrutsUtil.java
diff --git a/src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java b/action/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
rename to action/src/main/java/org/apache/struts/action2/util/SubsetIteratorFilter.java
diff --git a/src/java/org/apache/struts/action2/util/TabbedPane.java b/action/src/main/java/org/apache/struts/action2/util/TabbedPane.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/TabbedPane.java
rename to action/src/main/java/org/apache/struts/action2/util/TabbedPane.java
diff --git a/src/java/org/apache/struts/action2/util/Timer.java b/action/src/main/java/org/apache/struts/action2/util/Timer.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/Timer.java
rename to action/src/main/java/org/apache/struts/action2/util/Timer.java
diff --git a/src/java/org/apache/struts/action2/util/TokenHelper.java b/action/src/main/java/org/apache/struts/action2/util/TokenHelper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/TokenHelper.java
rename to action/src/main/java/org/apache/struts/action2/util/TokenHelper.java
diff --git a/src/java/org/apache/struts/action2/util/URLBean.java b/action/src/main/java/org/apache/struts/action2/util/URLBean.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/URLBean.java
rename to action/src/main/java/org/apache/struts/action2/util/URLBean.java
diff --git a/src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java b/action/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
rename to action/src/main/java/org/apache/struts/action2/util/VelocityStrutsUtil.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java b/action/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/CompilingClassLoader.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java b/action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoader.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java b/action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/ReloadingClassLoaderListener.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompiler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerFactory.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/JavaCompilerSettings.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseCompilationProblem.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompiler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java b/action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/compilers/eclipse/EclipseJavaCompilerSettings.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java b/action/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/listeners/CompilingListener.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java b/action/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/listeners/ReloadingListener.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java b/action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationListener.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java b/action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/monitor/FilesystemAlterationMonitor.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java b/action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblem.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/problems/CompilationProblemHandler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/problems/ConsoleCompilationProblemHandler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/problems/DefaultCompilationProblemHandler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java b/action/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/problems/LogCompilationProblemHandler.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java b/action/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/readers/FileResourceReader.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java b/action/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/readers/ResourceReader.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java b/action/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/stores/FileResourceStore.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java b/action/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/stores/MemoryResourceStore.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java b/action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStore.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java b/action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/stores/ResourceStoreClassLoader.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java b/action/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/stores/TransactionalResourceStore.java
diff --git a/src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java b/action/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
rename to action/src/main/java/org/apache/struts/action2/util/classloader/utils/ThreadUtils.java
diff --git a/src/java/org/apache/struts/action2/validators/DWRValidator.java b/action/src/main/java/org/apache/struts/action2/validators/DWRValidator.java
similarity index 100%
rename from src/java/org/apache/struts/action2/validators/DWRValidator.java
rename to action/src/main/java/org/apache/struts/action2/validators/DWRValidator.java
diff --git a/src/java/org/apache/struts/action2/views/JspSupportServlet.java b/action/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/JspSupportServlet.java
rename to action/src/main/java/org/apache/struts/action2/views/JspSupportServlet.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerManager.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerResult.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/FreemarkerServlet.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/PortletFreemarkerResult.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/ScopesHashModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsBeanWrapper.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/StrutsClassTemplateLoader.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionErrorModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionMessageModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ActionModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/AnchorModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/BeanModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CallbackWriter.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxListModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/CheckboxModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComboBoxModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ComponentModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DateModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DatePickerModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DebugModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DivModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/DoubleSelectModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FieldErrorModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FileModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/FormModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HeadModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/HiddenModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/I18nModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IncludeModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/IteratorModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/LabelModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/OptionTransferSelectModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PanelModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ParamModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PasswordModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PropertyModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/PushModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RadioModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/ResetModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/RichTextEditorModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SelectModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SetModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/StrutsModels.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/SubmitModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TabbedPanelModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TagModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextAreaModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextFieldModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TextModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TokenModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/TreeNodeModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/URLModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/UpDownSelectModel.java
diff --git a/src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java b/action/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
rename to action/src/main/java/org/apache/struts/action2/views/freemarker/tags/WebTableModel.java
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java b/action/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
rename to action/src/main/java/org/apache/struts/action2/views/jasperreports/CompileReport.java
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java b/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
rename to action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportConstants.java
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java b/action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jasperreports/JasperReportsResult.java
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java b/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
rename to action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackDataSource.java
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java b/action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
rename to action/src/main/java/org/apache/struts/action2/views/jasperreports/OgnlValueStackShadowMap.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ActionTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ActionTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ActionTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/BeanTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/BeanTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/BeanTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ComponentTagSupport.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/DateTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/DateTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/DateTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ElseIfTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ElseIfTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ElseTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ElseTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ElseTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/I18nTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/I18nTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/I18nTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/IfTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/IfTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/IfTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/IncludeTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/IncludeTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/IncludeTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/IteratorStatus.java b/action/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/IteratorStatus.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/IteratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/IteratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/IteratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ParamTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ParamTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ParamTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/PropertyTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/PropertyTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/PropertyTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/PushTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/PushTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/PushTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/SetTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/SetTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/SetTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java b/action/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/StrutsBodyTagSupport.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/TagUtils.java b/action/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/TagUtils.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/TagUtils.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/TextTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/TextTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/TextTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/URLTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/URLTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/URLTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/iterator/AppendIteratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/iterator/IteratorGeneratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/iterator/MergeIteratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SortIteratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/iterator/SubsetIteratorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/package.html b/action/src/main/java/org/apache/struts/action2/views/jsp/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/package.html
rename to action/src/main/java/org/apache/struts/action2/views/jsp/package.html
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractClosingTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractDoubleListTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractListTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRequiredListTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorResult.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AbstractUITag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/AnchorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/CheckboxTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/ComponentTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/DatePickerTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/DebugTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/DivTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/FileTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/FormTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/HeadTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/HiddenTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/LabelTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/OgnlTool.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/PanelTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/PasswordTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RadioTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/ResetTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResult.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResult.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResult.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResult.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/SelectTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/SubmitTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPaneTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TabbedPanelTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextFieldTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TextareaTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TokenTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeNodeTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/TreeTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTag.java
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java b/action/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
rename to action/src/main/java/org/apache/struts/action2/views/jsp/ui/table/WebTableTag.java
diff --git a/src/java/org/apache/struts/action2/views/tiles/TilesResult.java b/action/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/tiles/TilesResult.java
rename to action/src/main/java/org/apache/struts/action2/views/tiles/TilesResult.java
diff --git a/src/java/org/apache/struts/action2/views/util/ContextUtil.java b/action/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/util/ContextUtil.java
rename to action/src/main/java/org/apache/struts/action2/views/util/ContextUtil.java
diff --git a/src/java/org/apache/struts/action2/views/util/ResourceUtil.java b/action/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/util/ResourceUtil.java
rename to action/src/main/java/org/apache/struts/action2/views/util/ResourceUtil.java
diff --git a/src/java/org/apache/struts/action2/views/util/TextUtil.java b/action/src/main/java/org/apache/struts/action2/views/util/TextUtil.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/util/TextUtil.java
rename to action/src/main/java/org/apache/struts/action2/views/util/TextUtil.java
diff --git a/src/java/org/apache/struts/action2/views/util/UrlHelper.java b/action/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/util/UrlHelper.java
rename to action/src/main/java/org/apache/struts/action2/views/util/UrlHelper.java
diff --git a/src/java/org/apache/struts/action2/views/util/package.html b/action/src/main/java/org/apache/struts/action2/views/util/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/util/package.html
rename to action/src/main/java/org/apache/struts/action2/views/util/package.html
diff --git a/src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java b/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/StrutsResourceLoader.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java b/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityContext.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java b/action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/StrutsVelocityServlet.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/VelocityManager.java b/action/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/VelocityManager.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/VelocityManager.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/AbstractDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionErrorDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ActionMessageDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/AnchorDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/BeanDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/CheckBoxListDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ComboBoxDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ComponentDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/DateDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/DatePickerDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/DebugDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/DivDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/DoubleSelectDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/FieldErrorDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/FileDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/FormDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/HeadDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/HiddenDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/I18nDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/IncludeDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/LabelDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/OptionTransferSelectDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/PanelDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ParamDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/PasswordDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/PropertyDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/PushDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/RadioDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/ResetDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/RichTextEditorDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/SelectDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/SetDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/SubmitDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TabbedPanelDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TextAreaDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TextDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TextFieldDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TokenDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/TreeNodeDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/URLDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/UpDownSelectDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java b/action/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
rename to action/src/main/java/org/apache/struts/action2/views/velocity/components/WebTableDirective.java
diff --git a/src/java/org/apache/struts/action2/views/velocity/package.html b/action/src/main/java/org/apache/struts/action2/views/velocity/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/velocity/package.html
rename to action/src/main/java/org/apache/struts/action2/views/velocity/package.html
diff --git a/src/java/org/apache/struts/action2/views/xslt/AdapterNode.java b/action/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/AdapterNode.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/AdapterNode.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/ArrayAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/BeanAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/CollectionAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java b/action/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/CollectionNodeList.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/DOMAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java b/action/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/DefaultAdapterNode.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/DefaultElementAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/DocumentAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java b/action/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/ServletURIResolver.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java b/action/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/SimpleTextNode.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java b/action/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/ToStringAdapter.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/XSLTResult.java b/action/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/XSLTResult.java
rename to action/src/main/java/org/apache/struts/action2/views/xslt/XSLTResult.java
diff --git a/src/java/org/apache/struts/action2/views/xslt/package.html b/action/src/main/java/org/apache/struts/action2/views/xslt/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/xslt/package.html
rename to action/src/main/java/org/apache/struts/action2/views/xslt/package.html
diff --git a/src/java/META-INF/taglib.tld b/action/src/main/resources/META-INF/taglib.tld
similarity index 100%
rename from src/java/META-INF/taglib.tld
rename to action/src/main/resources/META-INF/taglib.tld
diff --git a/src/java/config-browser.xml b/action/src/main/resources/config-browser.xml
similarity index 100%
rename from src/java/config-browser.xml
rename to action/src/main/resources/config-browser.xml
diff --git a/src/java/config-browser/actionNames.ftl b/action/src/main/resources/config-browser/actionNames.ftl
similarity index 100%
rename from src/java/config-browser/actionNames.ftl
rename to action/src/main/resources/config-browser/actionNames.ftl
diff --git a/src/java/config-browser/config-styles.css b/action/src/main/resources/config-browser/config-styles.css
similarity index 100%
rename from src/java/config-browser/config-styles.css
rename to action/src/main/resources/config-browser/config-styles.css
diff --git a/src/java/config-browser/error.ftl b/action/src/main/resources/config-browser/error.ftl
similarity index 100%
rename from src/java/config-browser/error.ftl
rename to action/src/main/resources/config-browser/error.ftl
diff --git a/src/java/config-browser/page-footer.ftl b/action/src/main/resources/config-browser/page-footer.ftl
similarity index 100%
rename from src/java/config-browser/page-footer.ftl
rename to action/src/main/resources/config-browser/page-footer.ftl
diff --git a/src/java/config-browser/page-header.ftl b/action/src/main/resources/config-browser/page-header.ftl
similarity index 100%
rename from src/java/config-browser/page-header.ftl
rename to action/src/main/resources/config-browser/page-header.ftl
diff --git a/src/java/config-browser/showConfig.ftl b/action/src/main/resources/config-browser/showConfig.ftl
similarity index 100%
rename from src/java/config-browser/showConfig.ftl
rename to action/src/main/resources/config-browser/showConfig.ftl
diff --git a/src/java/config-browser/showValidators.ftl b/action/src/main/resources/config-browser/showValidators.ftl
similarity index 100%
rename from src/java/config-browser/showValidators.ftl
rename to action/src/main/resources/config-browser/showValidators.ftl
diff --git a/src/java/config-browser/simple-error.ftl b/action/src/main/resources/config-browser/simple-error.ftl
similarity index 100%
rename from src/java/config-browser/simple-error.ftl
rename to action/src/main/resources/config-browser/simple-error.ftl
diff --git a/src/java/config-browser/tigris-macros.ftl b/action/src/main/resources/config-browser/tigris-macros.ftl
similarity index 100%
rename from src/java/config-browser/tigris-macros.ftl
rename to action/src/main/resources/config-browser/tigris-macros.ftl
diff --git a/src/java/config-browser/validatorDetails.ftl b/action/src/main/resources/config-browser/validatorDetails.ftl
similarity index 100%
rename from src/java/config-browser/validatorDetails.ftl
rename to action/src/main/resources/config-browser/validatorDetails.ftl
diff --git a/src/java/org/apache/struts/action2/default.properties b/action/src/main/resources/org/apache/struts/action2/default.properties
similarity index 100%
rename from src/java/org/apache/struts/action2/default.properties
rename to action/src/main/resources/org/apache/struts/action2/default.properties
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/console.ftl b/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/console.ftl
rename to action/src/main/resources/org/apache/struts/action2/interceptor/debugging/console.ftl
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/webconsole.css b/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/webconsole.css
rename to action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.css
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/webconsole.html b/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/webconsole.html
rename to action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.html
diff --git a/src/java/org/apache/struts/action2/interceptor/debugging/webconsole.js b/action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/debugging/webconsole.js
rename to action/src/main/resources/org/apache/struts/action2/interceptor/debugging/webconsole.js
diff --git a/src/java/org/apache/struts/action2/interceptor/package.html b/action/src/main/resources/org/apache/struts/action2/interceptor/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/package.html
rename to action/src/main/resources/org/apache/struts/action2/interceptor/package.html
diff --git a/src/java/org/apache/struts/action2/interceptor/wait.ftl b/action/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl
similarity index 100%
rename from src/java/org/apache/struts/action2/interceptor/wait.ftl
rename to action/src/main/resources/org/apache/struts/action2/interceptor/wait.ftl
diff --git a/src/java/org/apache/struts/action2/lifecycle/package.html b/action/src/main/resources/org/apache/struts/action2/lifecycle/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/lifecycle/package.html
rename to action/src/main/resources/org/apache/struts/action2/lifecycle/package.html
diff --git a/src/java/org/apache/struts/action2/package.html b/action/src/main/resources/org/apache/struts/action2/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/package.html
rename to action/src/main/resources/org/apache/struts/action2/package.html
diff --git a/src/java/org/apache/struts/action2/sitegraph/sitegraph-usage.txt b/action/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
rename to action/src/main/resources/org/apache/struts/action2/sitegraph/sitegraph-usage.txt
diff --git a/src/java/org/apache/struts/action2/static/CommonFunctions.js b/action/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/CommonFunctions.js
rename to action/src/main/resources/org/apache/struts/action2/static/CommonFunctions.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/CHANGELOG.txt b/action/src/main/resources/org/apache/struts/action2/static/dojo/CHANGELOG.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/CHANGELOG.txt
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/CHANGELOG.txt
diff --git a/src/java/org/apache/struts/action2/static/dojo/LICENSE.txt b/action/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/LICENSE.txt
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/LICENSE.txt
diff --git a/src/java/org/apache/struts/action2/static/dojo/README.txt b/action/src/main/resources/org/apache/struts/action2/static/dojo/README.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/README.txt
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/README.txt
diff --git a/src/java/org/apache/struts/action2/static/dojo/dojo.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/dojo.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/dojo.js.uncompressed.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/iframe_history.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/iframe_history.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/iframe_history.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/iframe_history.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/alg/Alg.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/alg/Alg.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/Alg.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/alg/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/alg/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/alg/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/animation/Animation.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/animation/Animation.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Animation.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/animation/Timer.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/animation/Timer.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/Timer.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/animation/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/animation/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/animation/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/bootstrap1.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/bootstrap1.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap1.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/bootstrap2.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/bootstrap2.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/bootstrap2.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/browser_debug.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/browser_debug.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/browser_debug.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ArrayList.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/BinaryTree.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/ByteArray.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Collections.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Collections.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Collections.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Dictionary.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Graph.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Graph.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Graph.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/List.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/List.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/List.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Queue.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Queue.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Queue.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Set.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Set.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Set.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/SkipList.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SkipList.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/SortedList.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/SortedList.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/Stack.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/Stack.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/Stack.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/collections/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/collections/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/collections/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Blowfish.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/LICENSE b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/LICENSE
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/MD5.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/MD5.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/Rijndael.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/SHA.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/SHA256.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/crypto/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/crypto/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/data.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/data.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/data.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/data/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/data/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/data/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/date.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/date.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/date.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/DragAndDrop.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragAndDrop.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragManager.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/HtmlDragMove.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/Sortable.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dnd/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dnd/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/dom.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/dom.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/dom.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/event.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/event.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/event.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/event/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/event/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/event/browser.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/event/browser.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/browser.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/event/topic.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/event/topic.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/event/topic.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/fx/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/fx/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/fx/html.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/fx/html.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/html.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/fx/svg.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/fx/svg.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/fx/svg.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/Colorspace.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/graphics/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/graphics/color.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/graphics/color.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/color.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/graphics/htmlEffects.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_adobesvg.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_browser.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_browser.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_jsc.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_rhino.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_spidermonkey.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_svg.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_svg.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/hostenv_wsh.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/html.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/html.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/html.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/BrowserIO.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/IframeIO.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/IframeIO.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RepubsubIO.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/RhinoIO.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/cookie.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/cookie.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookie.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/io/cookies.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/io/cookies.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/io/cookies.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/json.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/json.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/json.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/lang.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/lang.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/lang/Lang.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/lang/Lang.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/Lang.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/lang/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/lang/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/lang/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/logging/Logger.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/logging/Logger.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/Logger.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/logging/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/logging/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/logging/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math/Math.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math/Math.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/Math.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math/curves.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math/curves.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/curves.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math/matrix.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math/matrix.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/matrix.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/math/points.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/math/points.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/math/points.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/profile.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/profile.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/profile.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/reflect/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/reflect/reflection.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/reflect/reflection.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/regexp.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/regexp.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/regexp.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/JsonService.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/rpc/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/rpc/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage/Storage.as b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage/Storage.as
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.as
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage/Storage.swf b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/Storage.swf
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage/browser.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage/browser.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/browser.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/storage/storage.sh b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/storage/storage.sh
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/storage/storage.sh
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/string.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/string.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/string.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/string/Builder.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/string/Builder.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/Builder.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/string/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/string/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/string/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/style.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/style.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/style.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/svg.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/svg.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/svg.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/text/Builder.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/text/Builder.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Builder.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/text/String.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/text/String.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/String.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/text/Text.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/text/Text.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/Text.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/text/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/text/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/text/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/undo/Manager.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/undo/Manager.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/undo/Manager.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/uri/Uri.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/uri/Uri.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/Uri.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/uri/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/uri/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/uri/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/validate.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/validate.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/validate.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/DomWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/HtmlWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/SvgWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/Widget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/Widget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/Widget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/WidgetManager.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Button.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ComboBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/ContextMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/DropdownButtons.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLComboBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLContextMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLMenuItem.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/HTMLResizableTextarea.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/InlineEditBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Menu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/MenuItem.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Parse.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SVGButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/SlideShow.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/Tabs.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/templates/buttons/-.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/templates/buttons/-.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/webui/widgets/templates/buttons/-.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/webui/widgets/templates/buttons/-.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Accordion.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Accordion.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Button.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Button.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Button2.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Button2.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Button2.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Chart.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Chart.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Chart.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Checkbox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/CiviCrmDatePicker.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ColorPalette.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ComboBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Container.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Container.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Container.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ContextMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DatePicker.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Dialog.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Dialog.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DomWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/DropdownButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Editor.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Editor.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Editor.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FisheyeList.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/FloatingPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlColorPalette.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlColorPalette.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlColorPalette.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlColorPalette.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlContainer.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlContainer.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlContainer.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlContainer.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlFisheyeList.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlFisheyeList.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlFisheyeList.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlFisheyeList.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlInlineEditBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlInlineEditBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlInlineEditBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlInlineEditBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlLayoutPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlLayoutPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlLayoutPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlLayoutPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu2.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu2.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenu2.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenuItem.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenuItem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlMenuItem.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlMenuItem.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlResizeHandle.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlResizeHandle.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlResizeHandle.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlResizeHandle.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlRichText.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlRichText.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlRichText.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlRichText.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlSlideShow.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlSlideShow.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlSlideShow.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlSlideShow.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlSplitPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlSplitPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlSplitPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlSplitPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlTabSet.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlTabSet.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlTabSet.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlTabSet.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlTabs.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlTabs.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlTabs.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlTabs.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/HtmlWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/InlineEditBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/LayoutPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Manager.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Manager.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Manager.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Menu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Menu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Menu2.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Menu2.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/MenuItem.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Parse.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Parse.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Parse.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/PopUpButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizableTextarea.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/ResizeHandle.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/RichText.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/RichText.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/RichText.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SimpleDropdownButtons.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SlideShow.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SplitPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/SvgWidget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/TabSet.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabSet.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/TabSet.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TabSet.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Tabs.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tabs.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TaskBar.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TemplatedContainer.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/TimePicker.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Toggler.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toggler.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Toolbar.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tooltip.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Tree.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Tree.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Tree.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Widget.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Widget.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Widget.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/Wizard.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/Wizard.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Button.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Button2.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Checkbox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ComboBox.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Container.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Container.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/ContextMenu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DatePicker.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/DropdownButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/LayoutPane.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Menu.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/MenuItem.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TaskBar.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/TimePicker.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/Tooltip.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/html/stabile.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/svg/Chart.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/AccordionPanel.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButton2Template.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlButtonTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlCiviCrmDatePicker.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboBox.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlComboButton2Template.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlContextMenuTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDatePicker.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDialog.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlDropDownButtonTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFisheyeList.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlFloatingPane.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlInlineEditBox.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlLayoutPane.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenu2.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlMenuItemTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizableTextarea.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlResizeHandle.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSimpleDropdownButtons.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSlideShow.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlSplitPane.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabSet.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabSet.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabSet.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabSet.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTabs.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBar.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTaskBarItemTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTimePicker.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlToolbar.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/HtmlTooltipTemplate.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Menu.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/PopUpButton.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Tree.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.css
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/Wizard.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/-.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/backcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/bold.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cancel.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/copy.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/createlink.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/cut.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/delete.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/forecolor.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/hilitecolor.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/indent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserthorizontalrule.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertimage.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/inserttable.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/insertunorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/italic.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifycenter.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyfull.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyleft.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/justifyright.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/left_to_right.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_indent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_bullet_outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_indent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/list_num_outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/paste.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/redo.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/removeformat.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/right_to_left.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/save.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/space.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/strikethrough.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/subscript.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/superscript.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/underline.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/undo.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/buttons/wikiword.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_off.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/check_on.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementMonth.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/decrementWeek.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/grabCorner.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/blank.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/combo_box_arrow.png
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow-disabled.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/dropdownButtonsArrow.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/no.svg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-c.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-l.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji-r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-blue_benji_p_01.svg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-c.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-l.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji-r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-gray_benji.svg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-c.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-l.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji-r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-purple_benji_01.svg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_ben_01.svg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-c.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-l.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/pill-button-seagreen_benji-r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_off.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/submenu_on.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_left_r_curr.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/tab_right_r_curr.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/titlebar-bg.jpg
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/toolbar-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/transparent.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_blank.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_minus.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_expand_plus.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_c.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_l.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_p.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_t.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_v.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_x.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_y.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_grid_z.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/treenode_node.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/verticalbar.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/images/whiteDownArrow.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementMonth.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/widget/templates/incrementWeek.gif
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/xml/Parse.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/xml/Parse.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/Parse.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/xml/__package__.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/xml/__package__.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/__package__.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/xml/domUtil.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/domUtil.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/htmlUtil.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/src/xml/svgUtil.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/Util.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/Util.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/Util.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/Bind.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindAnchor.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindButton.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/BindDiv.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.html
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/DynArchCalendar.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js b/action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/struts/widgets/ToggleBindDiv.js
diff --git a/src/java/org/apache/struts/action2/static/dojo/version.txt b/action/src/main/resources/org/apache/struts/action2/static/dojo/version.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/dojo/version.txt
rename to action/src/main/resources/org/apache/struts/action2/static/dojo/version.txt
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/README b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/README
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/README
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/README
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-blue.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-blue.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-blue.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-blue.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-blue2.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-blue2.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-blue2.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-blue2.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-brown.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-brown.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-brown.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-brown.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-green.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-green.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-green.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-green.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-setup.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-setup.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-setup.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-setup.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-setup_stripped.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-setup_stripped.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-setup_stripped.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-setup_stripped.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-system.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-system.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-system.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-system.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-tas.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-tas.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-tas.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-tas.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-1.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-1.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-1.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-1.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-2.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-2.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-2.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-2.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-1.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-1.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-1.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-1.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-2.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-2.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-2.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar-win2k-cold-2.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/calendar_stripped.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar_stripped.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/calendar_stripped.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/calendar_stripped.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/img.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/img.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/img.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/img.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-af.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-af.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-af.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-af.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-al.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-al.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-al.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-al.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-bg.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-bg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-bg.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-bg.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-big5-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-big5-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-big5-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-big5-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-big5.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-big5.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-big5.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-big5.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-br.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-br.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-br.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-br.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ca.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ca.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ca.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ca.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-win.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-win.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-win.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-cs-win.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-da.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-da.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-da.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-da.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-de.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-de.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-de.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-de.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-du.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-du.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-du.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-du.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-el.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-el.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-el.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-el.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-en.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-en.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-en.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-en.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-es.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-es.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-es.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-es.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-fi.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-fi.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-fi.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-fi.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-fr.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-fr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-fr.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-fr.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-he-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-he-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-he-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-he-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hr-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hr-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hr-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hr-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hr.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hr.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hr.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hu.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-hu.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-hu.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-it.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-it.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-it.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-it.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-jp.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-jp.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-jp.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-jp.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ko-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ko-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ko-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ko-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ko.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ko.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ko.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lt-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lt-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lt-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lt-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lt.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lt.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lt.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lt.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lv.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-lv.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-lv.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-nl.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-nl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-nl.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-nl.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-no.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-no.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-no.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-no.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pl-utf8.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pl-utf8.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pl-utf8.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pl-utf8.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pl.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pl.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pl.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pt.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pt.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-pt.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-pt.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ro.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ro.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ro.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ro.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ru.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ru.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ru.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ru.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ru_win_.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ru_win_.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-ru_win_.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-ru_win_.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-si.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-si.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-si.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-si.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sk.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sk.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sk.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sk.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sp.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sp.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sp.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sp.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sv.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-sv.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-sv.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-tr.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-tr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-tr.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-tr.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-zh.js b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-zh.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/lang/calendar-zh.js
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/lang/calendar-zh.js
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/menuarrow.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/menuarrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/menuarrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/menuarrow.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/menuarrow2.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/menuarrow2.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/menuarrow2.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/menuarrow2.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/release-notes.html b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/release-notes.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/release-notes.html
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/release-notes.html
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/active-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/active-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/active-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/active-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/dark-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/dark-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/dark-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/dark-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/hover-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/hover-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/hover-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/hover-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/menuarrow.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/menuarrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/menuarrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/menuarrow.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/normal-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/normal-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/normal-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/normal-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/rowhover-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/rowhover-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/rowhover-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/rowhover-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/status-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/status-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/status-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/status-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/theme.css b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/theme.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/theme.css
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/theme.css
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/title-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/title-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/title-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/title-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/today-bg.gif b/action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/today-bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/jscalendar/skins/aqua/today-bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/jscalendar/skins/aqua/today-bg.gif
diff --git a/src/java/org/apache/struts/action2/static/niftycorners/layout.js b/action/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/niftycorners/layout.js
rename to action/src/main/resources/org/apache/struts/action2/static/niftycorners/layout.js
diff --git a/src/java/org/apache/struts/action2/static/niftycorners/nifty.js b/action/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/niftycorners/nifty.js
rename to action/src/main/resources/org/apache/struts/action2/static/niftycorners/nifty.js
diff --git a/src/java/org/apache/struts/action2/static/niftycorners/niftyCorners.css b/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/niftycorners/niftyCorners.css
rename to action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyCorners.css
diff --git a/src/java/org/apache/struts/action2/static/niftycorners/niftyPrint.css b/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/niftycorners/niftyPrint.css
rename to action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftyPrint.css
diff --git a/src/java/org/apache/struts/action2/static/niftycorners/niftylayout.css b/action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/niftycorners/niftylayout.css
rename to action/src/main/resources/org/apache/struts/action2/static/niftycorners/niftylayout.css
diff --git a/src/java/org/apache/struts/action2/static/optiontransferselect/optiontransferselect.js b/action/src/main/resources/org/apache/struts/action2/static/optiontransferselect/optiontransferselect.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/optiontransferselect/optiontransferselect.js
rename to action/src/main/resources/org/apache/struts/action2/static/optiontransferselect/optiontransferselect.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/_documentation.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/_documentation.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/_documentation.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/_documentation.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/_whatsnew.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/_whatsnew.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/_whatsnew.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/_whatsnew.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenugroup.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenugroup.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenugroup.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenugroup.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuitem.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuitem.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuitem.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuitem.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuseparator.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuseparator.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuseparator.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckcontextmenuseparator.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckevents.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckevents.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckevents.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckevents.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckpanel_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckplugin.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckplugin.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckplugin.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckplugin.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckspecialcombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckspecialcombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckspecialcombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckspecialcombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstyledef_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstylesloader.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstylesloader.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstylesloader.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckstylesloader.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbar.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbar.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbar.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbreak_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbutton.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbutton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbutton.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarbutton.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontformatcombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontformatcombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontformatcombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontformatcombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontscombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontscombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontscombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontscombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontsizecombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontsizecombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontsizecombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarfontsizecombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarpanelbutton.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarpanelbutton.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarpanelbutton.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarpanelbutton.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarspecialcombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarspecialcombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarspecialcombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarspecialcombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarstylecombo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarstylecombo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarstylecombo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fcktoolbarstylecombo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/classes/fckxml_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fck_othercommands.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fck_othercommands.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fck_othercommands.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fck_othercommands.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcknamedcommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcknamedcommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcknamedcommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcknamedcommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpasteplaintextcommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpastewordcommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpastewordcommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpastewordcommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckpastewordcommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckstylecommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckstylecommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckstylecommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fckstylecommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktablecommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktablecommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktablecommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktablecommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktextcolorcommand.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktextcolorcommand.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktextcolorcommand.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/commandclasses/fcktextcolorcommand.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fck_constants.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fck_constants.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fck_constants.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fck_constants.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fckeditorapi.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fckeditorapi.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fckeditorapi.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/globals/fckeditorapi.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_1_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_2_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_last.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_last.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_last.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_last.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_onload.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_onload.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_onload.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fck_onload.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckbrowserinfo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckbrowserinfo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckbrowserinfo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckbrowserinfo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcodeformatter.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcodeformatter.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcodeformatter.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcodeformatter.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcommands.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcommands.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcommands.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcommands.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckconfig.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckconfig.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckconfig.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckconfig.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcontextmenu.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcontextmenu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcontextmenu.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcontextmenu.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcoreextensions.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcoreextensions.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcoreextensions.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckcoreextensions.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdebug.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdebug.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdebug.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdebug.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckdialog_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcklanguagemanager.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcklanguagemanager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcklanguagemanager.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcklanguagemanager.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcknamespace.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcknamespace.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcknamespace.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcknamespace.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckplugins.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckplugins.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckplugins.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckplugins.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckregexlib.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckregexlib.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckregexlib.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckregexlib.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckscriptloader.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckscriptloader.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckscriptloader.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckscriptloader.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckselection_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktablehandler_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbaritems.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbaritems.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbaritems.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbaritems.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbarset.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbarset.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbarset.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktoolbarset.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fcktools_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckundo_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckurlparams.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckurlparams.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckurlparams.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckurlparams.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_gecko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_gecko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_gecko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_gecko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_ie.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_ie.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_ie.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtml_ie.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtmlentities.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtmlentities.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtmlentities.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/_source/internals/fckxhtmlentities.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/disablehandles.htc b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/disablehandles.htc
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/disablehandles.htc
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/disablehandles.htc
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.htc b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.htc
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.htc
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/hiddenfield.htc
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/showtableborders.htc b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/showtableborders.htc
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/showtableborders.htc
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/behaviors/showtableborders.htc
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_editorarea.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_editorarea.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_editorarea.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_editorarea.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_internal.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_internal.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_internal.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_internal.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_showtableborders_gecko.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_showtableborders_gecko.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/fck_showtableborders_gecko.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/fck_showtableborders_gecko.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_anchor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_anchor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_anchor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_anchor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_flashlogo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_flashlogo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_flashlogo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_flashlogo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_pagebreak.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_pagebreak.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_pagebreak.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/css/images/fck_pagebreak.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fck_dialog_common.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fcknumericfield.htc b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fcknumericfield.htc
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fcknumericfield.htc
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/fcknumericfield.htc
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/locked.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/locked.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/locked.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/locked.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/reset.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/reset.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/reset.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/reset.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/unlocked.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/unlocked.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/unlocked.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/images/unlocked.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/moz-bindings.xml b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/moz-bindings.xml
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/moz-bindings.xml
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/common/moz-bindings.xml
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/lgpl.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/lgpl.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/lgpl.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/lgpl.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fckeditor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fckeditor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fckeditor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fckeditor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fredck.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fredck.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fredck.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_about/logo_fredck.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_anchor.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_anchor.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_anchor.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_anchor.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_button.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_button.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_button.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_button.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_checkbox.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_checkbox.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_checkbox.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_checkbox.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_colorselector.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_colorselector.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_colorselector.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_colorselector.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops/fck_document_preview.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops/fck_document_preview.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops/fck_document_preview.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_docprops/fck_document_preview.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_find.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_find.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_find.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_find.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash_preview.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash_preview.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash_preview.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_flash/fck_flash_preview.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_form.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_form.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_form.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_form.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_hiddenfield.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_hiddenfield.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_hiddenfield.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_hiddenfield.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image_preview.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image_preview.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image_preview.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_image/fck_image_preview.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link/fck_link.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link/fck_link.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link/fck_link.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_link/fck_link.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_listprop.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_listprop.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_listprop.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_listprop.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_paste.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_paste.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_paste.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_paste.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_radiobutton.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_radiobutton.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_radiobutton.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_radiobutton.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_replace.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_replace.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_replace.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_replace.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select/fck_select.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select/fck_select.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select/fck_select.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_select/fck_select.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_smiley.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_smiley.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_smiley.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_smiley.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_source.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_source.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_source.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_source.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_specialchar.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_specialchar.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_specialchar.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_specialchar.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/blank.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controls.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_table.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_table.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_table.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_table.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_tablecell.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_tablecell.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_tablecell.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_tablecell.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template1.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template1.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template1.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template1.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template2.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template2.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template2.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template2.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template3.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template3.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template3.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_template/images/template3.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textarea.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textarea.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textarea.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textarea.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textfield.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textfield.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textfield.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_textfield.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/00.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/00.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/00.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/00.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/data.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/data.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/data.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/data.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/diacritic.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/diacritic.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/diacritic.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/diacritic.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/dialogue.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/dialogue.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/dialogue.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/dialogue.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/fck_universalkey.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/fck_universalkey.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/fck_universalkey.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/fck_universalkey.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/keyboard_layout.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/keyboard_layout.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/keyboard_layout.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/keyboard_layout.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/multihexa.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/multihexa.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/multihexa.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/dialog/fck_universalkey/multihexa.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckblank.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckblank.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckblank.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckblank.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdebug.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdebug.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdebug.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdebug.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdialog.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdialog.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdialog.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdialog.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdocument.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdocument.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckdocument.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckdocument.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.original.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.original.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.original.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/fckeditor.original.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/browser.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmactualfolder.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmactualfolder.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmactualfolder.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmactualfolder.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmcreatefolder.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmcreatefolder.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmcreatefolder.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmcreatefolder.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmfolders.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmfolders.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmfolders.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmfolders.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourceslist.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourceslist.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourceslist.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourceslist.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourcetype.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourcetype.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourcetype.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmresourcetype.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmupload.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmupload.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmupload.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/frmupload.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/ButtonArrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/ButtonArrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/ButtonArrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/ButtonArrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder32.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder32.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder32.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/Folder32.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened32.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened32.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened32.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderOpened32.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderUp.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderUp.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderUp.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/FolderUp.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ai.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ai.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ai.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ai.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/avi.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/avi.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/avi.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/avi.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/bmp.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/cs.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/cs.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/cs.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/cs.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/dll.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/dll.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/dll.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/dll.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/doc.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/doc.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/doc.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/doc.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/exe.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/exe.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/exe.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/exe.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/fla.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/fla.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/fla.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/fla.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/gif.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/gif.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/gif.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/gif.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/htm.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/htm.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/htm.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/htm.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/html.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/html.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/html.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/html.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/jpg.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/js.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/js.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/js.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/js.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mdb.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mp3.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/pdf.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ppt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/rdp.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swf.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swf.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swf.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swf.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/swt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/txt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/txt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/txt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/txt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/vsd.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xls.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xls.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xls.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xls.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xml.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xml.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xml.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/xml.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/zip.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/zip.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/zip.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/32/zip.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ai.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ai.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ai.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ai.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/avi.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/avi.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/avi.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/avi.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/bmp.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/bmp.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/bmp.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/bmp.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/cs.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/cs.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/cs.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/cs.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/default.icon.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/default.icon.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/default.icon.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/default.icon.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/dll.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/dll.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/dll.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/dll.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/doc.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/doc.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/doc.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/doc.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/exe.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/exe.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/exe.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/exe.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/fla.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/fla.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/fla.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/fla.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/gif.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/gif.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/gif.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/gif.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/htm.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/htm.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/htm.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/htm.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/html.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/html.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/html.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/html.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/jpg.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/jpg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/jpg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/jpg.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/js.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/js.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/js.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/js.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mdb.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mdb.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mdb.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mdb.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mp3.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mp3.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mp3.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/mp3.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/pdf.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/pdf.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/pdf.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/pdf.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ppt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ppt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ppt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/ppt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/rdp.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/rdp.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/rdp.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/rdp.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swf.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swf.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swf.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swf.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/swt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/txt.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/txt.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/txt.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/txt.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/vsd.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/vsd.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/vsd.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/vsd.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xls.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xls.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xls.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xls.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xml.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xml.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xml.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/xml.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/zip.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/zip.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/zip.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/icons/zip.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/spacer.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/spacer.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/spacer.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/images/spacer.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/common.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/common.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/common.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/common.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/fckxml.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/fckxml.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/fckxml.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/filemanager/browser/default/js/fckxml.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/anchor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/anchor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/anchor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/anchor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angel_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angel_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angel_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angel_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angry_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angry_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angry_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/angry_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/broken_heart.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/broken_heart.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/broken_heart.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/broken_heart.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cake.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cake.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cake.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cake.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/confused_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/confused_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/confused_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/confused_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cry_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cry_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cry_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/cry_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/devil_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/devil_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/devil_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/devil_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/embaressed_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/embaressed_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/embaressed_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/embaressed_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/envelope.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/envelope.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/envelope.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/envelope.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/heart.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/heart.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/heart.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/heart.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/kiss.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/kiss.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/kiss.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/kiss.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/lightbulb.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/lightbulb.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/lightbulb.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/lightbulb.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/omg_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/omg_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/omg_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/omg_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/regular_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/regular_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/regular_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/regular_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/sad_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/sad_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/sad_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/sad_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/shades_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/shades_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/shades_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/shades_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/teeth_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/teeth_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/teeth_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/teeth_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_down.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_down.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_down.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_down.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_up.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_up.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_up.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/thumbs_up.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/tounge_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/tounge_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/tounge_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/tounge_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/wink_smile.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/wink_smile.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/wink_smile.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/smiley/msn/wink_smile.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/images/spacer.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/spacer.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/images/spacer.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/images/spacer.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fck_startup.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fck_startup.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fck_startup.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fck_startup.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_1.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_1.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_1.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_1.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_2.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_2.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_gecko_2.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_1.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_1.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_1.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_1.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_2.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_2.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_2.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/js/fckeditorcode_ie_2.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/_getfontformat.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/_getfontformat.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/_getfontformat.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/_getfontformat.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/_translationstatus.txt b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/_translationstatus.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/_translationstatus.txt
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/_translationstatus.txt
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ar.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ar.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ar.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ar.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/bg.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/bg.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/bg.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/bg.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/bs.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/bs.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/bs.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/bs.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ca.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ca.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ca.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ca.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/cs.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/cs.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/cs.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/cs.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/da.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/da.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/da.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/da.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/de.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/de.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/de.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/de.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/el.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/el.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/el.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/el.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en-au.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en-au.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en-au.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en-au.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en-uk.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en-uk.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en-uk.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en-uk.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/en.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/en.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/eo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/eo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/eo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/eo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/es.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/es.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/es.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/es.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/et.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/et.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/et.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/et.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/eu.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/eu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/eu.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/eu.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fa.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fa.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fa.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fa.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fcklanguagemanager.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fcklanguagemanager.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fcklanguagemanager.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fcklanguagemanager.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fi.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fi.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fi.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fi.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fo.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fo.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fo.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fo.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fr.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/fr.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/fr.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/gl.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/gl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/gl.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/gl.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/he.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/he.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/he.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/he.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hi.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hi.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hi.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hi.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hr.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hr.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hr.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hu.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hu.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/hu.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/hu.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/it.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/it.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/it.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/it.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ja.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ja.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ja.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ja.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ko.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ko.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ko.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ko.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/lt.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/lt.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/lt.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/lt.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/lv.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/lv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/lv.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/lv.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/mn.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/mn.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/mn.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/mn.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ms.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ms.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ms.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ms.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/nl.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/nl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/nl.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/nl.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/no.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/no.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/no.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/no.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pl.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pl.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pl.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pt-br.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pt-br.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pt-br.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pt-br.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pt.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pt.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/pt.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/pt.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ro.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ro.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ro.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ro.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ru.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ru.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/ru.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/ru.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sk.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sk.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sk.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sk.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sl.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sl.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sl.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sr-latn.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sr-latn.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sr-latn.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sr-latn.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sr.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sr.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sr.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sv.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sv.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/sv.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/sv.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/th.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/th.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/th.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/th.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/tr.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/tr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/tr.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/tr.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/uk.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/uk.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/uk.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/uk.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/vi.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/vi.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/vi.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/vi.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/zh-cn.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/zh-cn.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/zh-cn.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/zh-cn.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/zh.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/zh.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/lang/zh.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/lang/zh.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fck_placeholder.html b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fck_placeholder.html
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fck_placeholder.html
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fck_placeholder.html
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fckplugin.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fckplugin.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fckplugin.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/fckplugin.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/de.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/de.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/de.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/de.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/en.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/en.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/en.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/en.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/fr.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/fr.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/fr.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/fr.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/it.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/it.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/it.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/it.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/pl.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/pl.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/pl.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/lang/pl.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/placeholder.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/placeholder.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/placeholder.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/placeholder/placeholder.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/simplecommands/fckplugin.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/simplecommands/fckplugin.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/simplecommands/fckplugin.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/simplecommands/fckplugin.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/tablecommands/fckplugin.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/tablecommands/fckplugin.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/plugins/tablecommands/fckplugin.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/plugins/tablecommands/fckplugin.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_contextmenu.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_contextmenu.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_contextmenu.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_contextmenu.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_dialog.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_dialog.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_dialog.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_dialog.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_editor.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_editor.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_editor.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/fck_editor.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.arrowright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.arrowright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.arrowright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.arrowright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.buttonarrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.buttonarrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.buttonarrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.buttonarrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.collapse.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.collapse.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.collapse.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.collapse.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.end.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.end.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.end.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.end.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.expand.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.expand.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.expand.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.expand.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.separator.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.separator.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.separator.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.separator.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.start.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.start.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.start.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/images/toolbar.start.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/about.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/about.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/about.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/about.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/anchor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/anchor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/anchor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/anchor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bgcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bgcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bgcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bgcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bold.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bold.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bold.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bold.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bulletedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bulletedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bulletedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/bulletedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/button.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/button.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/button.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/button.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/checkbox.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/checkbox.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/checkbox.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/checkbox.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/copy.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/copy.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/copy.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/copy.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/cut.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/cut.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/cut.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/cut.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/docprops.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/docprops.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/docprops.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/docprops.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/find.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/find.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/find.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/find.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/flash.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/flash.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/flash.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/flash.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/form.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/form.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/form.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/form.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/hiddenfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/hiddenfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/hiddenfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/hiddenfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/image.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/image.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/image.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/image.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/imagebutton.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/imagebutton.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/imagebutton.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/imagebutton.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/indent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/indent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/inserthorizontalrule.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/inserthorizontalrule.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/inserthorizontalrule.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/inserthorizontalrule.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertunorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertunorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertunorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/insertunorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/italic.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/italic.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/italic.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/italic.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifycenter.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifycenter.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifycenter.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifycenter.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyfull.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyfull.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyfull.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyfull.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyleft.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyleft.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyleft.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyleft.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/justifyright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/link.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/link.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/link.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/link.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/newpage.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/newpage.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/newpage.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/newpage.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/numberedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/numberedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/numberedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/numberedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pagebreak.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pagebreak.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pagebreak.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pagebreak.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/paste.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/paste.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/paste.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/paste.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pastetext.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pastetext.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pastetext.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pastetext.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pasteword.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pasteword.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pasteword.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/pasteword.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/preview.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/preview.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/preview.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/preview.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/print.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/print.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/print.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/print.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/radio.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/radio.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/radio.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/radio.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/redo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/redo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/redo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/redo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/removeformat.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/removeformat.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/removeformat.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/removeformat.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/replace.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/replace.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/replace.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/replace.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/save.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/save.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/save.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/save.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/select.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/select.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/select.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/select.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/selectall.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/selectall.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/selectall.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/selectall.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showdetails.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showdetails.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showdetails.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showdetails.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showtableborders.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showtableborders.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showtableborders.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/showtableborders.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/smiley.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/smiley.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/smiley.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/smiley.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/source.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/source.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/source.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/source.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/specialchar.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/specialchar.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/specialchar.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/specialchar.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/spellcheck.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/spellcheck.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/spellcheck.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/spellcheck.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/strikethrough.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/strikethrough.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/strikethrough.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/strikethrough.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/subscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/subscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/subscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/subscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/superscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/superscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/superscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/superscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/table.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/table.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/table.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/table.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablecell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablecell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablecell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablecell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecolumns.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecolumns.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecolumns.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeletecolumns.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeleterows.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeleterows.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeleterows.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tabledeleterows.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcolumn.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcolumn.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcolumn.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertcolumn.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tableinsertrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablemergecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablemergecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablemergecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablemergecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablesplitcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablesplitcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablesplitcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/tablesplitcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/templates.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/templates.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/templates.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/templates.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textarea.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textarea.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textarea.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textarea.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/textfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/underline.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/underline.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/underline.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/underline.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/undo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/undo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/undo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/undo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/universalkey.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/universalkey.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/universalkey.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/universalkey.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unlink.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unlink.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unlink.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unlink.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/default/toolbar/unorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_contextmenu.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_contextmenu.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_contextmenu.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_contextmenu.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_dialog.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_dialog.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_dialog.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_dialog.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_editor.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_editor.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_editor.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/fck_editor.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/office.start.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/office.start.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/office.start.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/office.start.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.arrowright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.arrowright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.arrowright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.arrowright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.bg.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.bg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.bg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.bg.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.buttonarrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.collapse.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.collapse.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.collapse.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.collapse.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.end.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.end.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.end.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.end.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.expand.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.expand.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.expand.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.expand.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.separator.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.separator.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.separator.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.separator.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.start.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.start.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.start.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/images/toolbar.start.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/about.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/about.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/about.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/about.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/anchor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/anchor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/anchor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/anchor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bgcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bgcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bgcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bgcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bold.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bold.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bold.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bold.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bulletedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bulletedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bulletedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/bulletedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/button.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/button.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/button.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/button.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/checkbox.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/checkbox.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/checkbox.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/checkbox.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/copy.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/copy.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/copy.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/copy.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/cut.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/cut.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/cut.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/cut.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/docprops.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/docprops.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/docprops.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/docprops.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/find.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/find.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/find.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/find.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/flash.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/flash.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/flash.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/flash.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/fontstyleadv.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/fontstyleadv.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/fontstyleadv.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/fontstyleadv.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/form.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/form.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/form.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/form.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hidden.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hidden.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hidden.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hidden.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hiddenfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hiddenfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hiddenfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/hiddenfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/image.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/image.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/image.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/image.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/imagebutton.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/imagebutton.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/imagebutton.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/imagebutton.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/indent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/indent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/input.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/input.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/input.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/input.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/inserthorizontalrule.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/inserthorizontalrule.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/inserthorizontalrule.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/inserthorizontalrule.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertunorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertunorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertunorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/insertunorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/italic.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/italic.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/italic.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/italic.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifycenter.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifycenter.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifycenter.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifycenter.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyfull.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyfull.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyfull.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyfull.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyleft.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyleft.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyleft.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyleft.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/justifyright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/link.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/link.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/link.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/link.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/mail.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/mail.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/mail.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/mail.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/new.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/new.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/new.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/new.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/newpage.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/newpage.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/newpage.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/newpage.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/numberedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/numberedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/numberedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/numberedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/open.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/open.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/open.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/open.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pagebreak.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pagebreak.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pagebreak.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pagebreak.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/paste.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/paste.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/paste.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/paste.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pastetext.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pastetext.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pastetext.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pastetext.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pasteword.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pasteword.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pasteword.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/pasteword.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/preview.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/preview.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/preview.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/preview.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/print.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/print.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/print.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/print.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/radio.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/radio.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/radio.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/radio.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/redo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/redo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/redo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/redo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/removeformat.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/removeformat.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/removeformat.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/removeformat.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/replace.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/replace.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/replace.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/replace.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/save.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/save.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/save.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/save.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/select.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/select.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/select.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/select.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/selectall.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/selectall.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/selectall.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/selectall.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showdetails.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showdetails.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showdetails.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showdetails.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showtableborders.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showtableborders.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showtableborders.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/showtableborders.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/smiley.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/smiley.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/smiley.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/smiley.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/source.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/source.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/source.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/source.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/specialchar.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/specialchar.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/specialchar.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/specialchar.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/spellcheck.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/spellcheck.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/spellcheck.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/spellcheck.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/strikethrough.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/strikethrough.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/strikethrough.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/strikethrough.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/subscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/subscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/subscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/subscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/superscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/superscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/superscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/superscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/table.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/table.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/table.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/table.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablecell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablecell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablecell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablecell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecolumns.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecolumns.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecolumns.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeletecolumns.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeleterows.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeleterows.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeleterows.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tabledeleterows.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcolumn.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcolumn.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcolumn.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertcolumn.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tableinsertrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablemergecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablemergecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablemergecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablemergecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablesplitcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablesplitcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablesplitcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/tablesplitcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/templates.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/templates.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/templates.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/templates.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textarea.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textarea.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textarea.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textarea.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/textfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/underline.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/underline.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/underline.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/underline.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/undo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/undo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/undo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/undo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/universalkey.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/universalkey.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/universalkey.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/universalkey.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unlink.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unlink.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unlink.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unlink.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/office2003/toolbar/unorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_contextmenu.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_contextmenu.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_contextmenu.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_contextmenu.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_dialog.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_dialog.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_dialog.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_dialog.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_editor.css b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_editor.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_editor.css
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/fck_editor.css
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.arrowright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.arrowright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.arrowright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.arrowright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonarrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonarrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonarrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonarrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonbg.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonbg.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonbg.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.buttonbg.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.collapse.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.collapse.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.collapse.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.collapse.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.end.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.end.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.end.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.end.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.expand.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.expand.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.expand.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.expand.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.separator.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.separator.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.separator.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.separator.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.start.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.start.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.start.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/images/toolbar.start.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/about.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/about.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/about.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/about.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/anchor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/anchor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/anchor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/anchor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bgcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bgcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bgcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bgcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bold.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bold.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bold.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bold.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bulletedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bulletedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bulletedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/bulletedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/button.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/button.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/button.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/button.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/checkbox.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/checkbox.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/checkbox.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/checkbox.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/copy.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/copy.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/copy.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/copy.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/cut.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/cut.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/cut.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/cut.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/docprops.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/docprops.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/docprops.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/docprops.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/find.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/find.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/find.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/find.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/flash.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/flash.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/flash.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/flash.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/form.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/form.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/form.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/form.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/hiddenfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/hiddenfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/hiddenfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/hiddenfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/image.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/image.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/image.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/image.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/imagebutton.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/imagebutton.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/imagebutton.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/imagebutton.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/indent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/indent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/indent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/indent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/inserthorizontalrule.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/inserthorizontalrule.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/inserthorizontalrule.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/inserthorizontalrule.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertunorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertunorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertunorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/insertunorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/italic.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/italic.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/italic.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/italic.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifycenter.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifycenter.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifycenter.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifycenter.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyfull.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyfull.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyfull.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyfull.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyleft.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyleft.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyleft.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyleft.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyright.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyright.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyright.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/justifyright.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/link.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/link.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/link.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/link.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/newpage.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/newpage.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/newpage.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/newpage.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/numberedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/numberedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/numberedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/numberedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/outdent.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/outdent.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/outdent.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/outdent.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pagebreak.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pagebreak.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pagebreak.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pagebreak.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/paste.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/paste.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/paste.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/paste.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pastetext.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pastetext.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pastetext.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pastetext.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pasteword.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pasteword.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pasteword.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/pasteword.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/preview.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/preview.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/preview.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/preview.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/print.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/print.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/print.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/print.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/radio.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/radio.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/radio.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/radio.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/redo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/redo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/redo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/redo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/removeformat.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/removeformat.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/removeformat.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/removeformat.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/replace.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/replace.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/replace.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/replace.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/save.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/save.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/save.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/save.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/select.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/select.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/select.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/select.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/selectall.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/selectall.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/selectall.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/selectall.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showdetails.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showdetails.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showdetails.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showdetails.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showtableborders.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showtableborders.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showtableborders.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/showtableborders.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/smiley.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/smiley.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/smiley.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/smiley.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/source.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/source.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/source.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/source.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/specialchar.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/specialchar.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/specialchar.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/specialchar.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/spellcheck.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/spellcheck.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/spellcheck.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/spellcheck.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/strikethrough.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/strikethrough.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/strikethrough.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/strikethrough.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/subscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/subscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/subscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/subscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/superscript.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/superscript.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/superscript.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/superscript.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/table.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/table.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/table.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/table.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablecell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablecell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablecell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablecell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecolumns.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecolumns.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecolumns.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeletecolumns.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeleterows.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeleterows.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeleterows.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tabledeleterows.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcolumn.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcolumn.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcolumn.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertcolumn.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertrow.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertrow.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertrow.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tableinsertrow.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablemergecells.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablemergecells.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablemergecells.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablemergecells.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablesplitcell.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablesplitcell.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablesplitcell.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/tablesplitcell.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/templates.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/templates.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/templates.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/templates.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textarea.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textarea.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textarea.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textarea.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textcolor.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textcolor.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textcolor.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textcolor.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textfield.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textfield.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textfield.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/textfield.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/underline.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/underline.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/underline.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/underline.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/undo.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/undo.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/undo.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/undo.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/universalkey.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/universalkey.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/universalkey.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/universalkey.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unlink.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unlink.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unlink.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unlink.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unorderedlist.gif b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unorderedlist.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unorderedlist.gif
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/editor/skins/silver/toolbar/unorderedlist.gif
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/fckconfig.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckconfig.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/fckconfig.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckconfig.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/fckeditor.js b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckeditor.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/fckeditor.js
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckeditor.js
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/fckstyles.xml b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckstyles.xml
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/fckstyles.xml
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fckstyles.xml
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/fcktemplates.xml b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fcktemplates.xml
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/fcktemplates.xml
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/fcktemplates.xml
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/htaccess.txt b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/htaccess.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/htaccess.txt
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/htaccess.txt
diff --git a/src/java/org/apache/struts/action2/static/richtexteditor/license.txt b/action/src/main/resources/org/apache/struts/action2/static/richtexteditor/license.txt
similarity index 100%
rename from src/java/org/apache/struts/action2/static/richtexteditor/license.txt
rename to action/src/main/resources/org/apache/struts/action2/static/richtexteditor/license.txt
diff --git a/src/java/org/apache/struts/action2/static/tabs.css b/action/src/main/resources/org/apache/struts/action2/static/tabs.css
similarity index 100%
rename from src/java/org/apache/struts/action2/static/tabs.css
rename to action/src/main/resources/org/apache/struts/action2/static/tabs.css
diff --git a/src/java/org/apache/struts/action2/static/tooltip/tooltip.gif b/action/src/main/resources/org/apache/struts/action2/static/tooltip/tooltip.gif
similarity index 100%
rename from src/java/org/apache/struts/action2/static/tooltip/tooltip.gif
rename to action/src/main/resources/org/apache/struts/action2/static/tooltip/tooltip.gif
diff --git a/src/java/org/apache/struts/action2/static/tooltip/wz_tooltip.js b/action/src/main/resources/org/apache/struts/action2/static/tooltip/wz_tooltip.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/tooltip/wz_tooltip.js
rename to action/src/main/resources/org/apache/struts/action2/static/tooltip/wz_tooltip.js
diff --git a/src/java/org/apache/struts/action2/static/validationClient.js b/action/src/main/resources/org/apache/struts/action2/static/validationClient.js
similarity index 100%
rename from src/java/org/apache/struts/action2/static/validationClient.js
rename to action/src/main/resources/org/apache/struts/action2/static/validationClient.js
diff --git a/src/java/org/apache/struts/action2/struts-messages.properties b/action/src/main/resources/org/apache/struts/action2/struts-messages.properties
similarity index 100%
rename from src/java/org/apache/struts/action2/struts-messages.properties
rename to action/src/main/resources/org/apache/struts/action2/struts-messages.properties
diff --git a/src/java/org/apache/struts/action2/struts-messages_da.properties b/action/src/main/resources/org/apache/struts/action2/struts-messages_da.properties
similarity index 100%
rename from src/java/org/apache/struts/action2/struts-messages_da.properties
rename to action/src/main/resources/org/apache/struts/action2/struts-messages_da.properties
diff --git a/src/java/org/apache/struts/action2/struts-messages_de.properties b/action/src/main/resources/org/apache/struts/action2/struts-messages_de.properties
similarity index 100%
rename from src/java/org/apache/struts/action2/struts-messages_de.properties
rename to action/src/main/resources/org/apache/struts/action2/struts-messages_de.properties
diff --git a/src/java/org/apache/struts/action2/util/package.html b/action/src/main/resources/org/apache/struts/action2/util/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/util/package.html
rename to action/src/main/resources/org/apache/struts/action2/util/package.html
diff --git a/src/java/org/apache/struts/action2/views/freemarker/package.html b/action/src/main/resources/org/apache/struts/action2/views/freemarker/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/freemarker/package.html
rename to action/src/main/resources/org/apache/struts/action2/views/freemarker/package.html
diff --git a/src/java/org/apache/struts/action2/views/jasperreports/package.html b/action/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jasperreports/package.html
rename to action/src/main/resources/org/apache/struts/action2/views/jasperreports/package.html
diff --git a/src/java/org/apache/struts/action2/views/jsp/iterator/package.html b/action/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/iterator/package.html
rename to action/src/main/resources/org/apache/struts/action2/views/jsp/iterator/package.html
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/package.html b/action/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/package.html
rename to action/src/main/resources/org/apache/struts/action2/views/jsp/ui/package.html
diff --git a/src/java/org/apache/struts/action2/views/jsp/ui/table/package.html b/action/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html
similarity index 100%
rename from src/java/org/apache/struts/action2/views/jsp/ui/table/package.html
rename to action/src/main/resources/org/apache/struts/action2/views/jsp/ui/table/package.html
diff --git a/src/java/overview.html b/action/src/main/resources/overview.html
similarity index 100%
rename from src/java/overview.html
rename to action/src/main/resources/overview.html
diff --git a/src/java/struts-default.xml b/action/src/main/resources/struts-default.xml
similarity index 100%
rename from src/java/struts-default.xml
rename to action/src/main/resources/struts-default.xml
diff --git a/src/java/struts.vm b/action/src/main/resources/struts.vm
similarity index 100%
rename from src/java/struts.vm
rename to action/src/main/resources/struts.vm
diff --git a/src/java/template/ajax/a.ftl b/action/src/main/resources/template/ajax/a.ftl
similarity index 100%
rename from src/java/template/ajax/a.ftl
rename to action/src/main/resources/template/ajax/a.ftl
diff --git a/src/java/template/ajax/controlheader.ftl b/action/src/main/resources/template/ajax/controlheader.ftl
similarity index 100%
rename from src/java/template/ajax/controlheader.ftl
rename to action/src/main/resources/template/ajax/controlheader.ftl
diff --git a/src/java/template/ajax/div.ftl b/action/src/main/resources/template/ajax/div.ftl
similarity index 100%
rename from src/java/template/ajax/div.ftl
rename to action/src/main/resources/template/ajax/div.ftl
diff --git a/src/java/template/ajax/dojoRequire.js b/action/src/main/resources/template/ajax/dojoRequire.js
similarity index 100%
rename from src/java/template/ajax/dojoRequire.js
rename to action/src/main/resources/template/ajax/dojoRequire.js
diff --git a/src/java/template/ajax/form-close.ftl b/action/src/main/resources/template/ajax/form-close.ftl
similarity index 100%
rename from src/java/template/ajax/form-close.ftl
rename to action/src/main/resources/template/ajax/form-close.ftl
diff --git a/src/java/template/ajax/form.ftl b/action/src/main/resources/template/ajax/form.ftl
similarity index 100%
rename from src/java/template/ajax/form.ftl
rename to action/src/main/resources/template/ajax/form.ftl
diff --git a/src/java/template/ajax/head.ftl b/action/src/main/resources/template/ajax/head.ftl
similarity index 100%
rename from src/java/template/ajax/head.ftl
rename to action/src/main/resources/template/ajax/head.ftl
diff --git a/src/java/template/ajax/submit-ajax.ftl b/action/src/main/resources/template/ajax/submit-ajax.ftl
similarity index 100%
rename from src/java/template/ajax/submit-ajax.ftl
rename to action/src/main/resources/template/ajax/submit-ajax.ftl
diff --git a/src/java/template/ajax/submit.ftl b/action/src/main/resources/template/ajax/submit.ftl
similarity index 100%
rename from src/java/template/ajax/submit.ftl
rename to action/src/main/resources/template/ajax/submit.ftl
diff --git a/src/java/template/ajax/tab-close.ftl b/action/src/main/resources/template/ajax/tab-close.ftl
similarity index 100%
rename from src/java/template/ajax/tab-close.ftl
rename to action/src/main/resources/template/ajax/tab-close.ftl
diff --git a/src/java/template/ajax/tab.ftl b/action/src/main/resources/template/ajax/tab.ftl
similarity index 100%
rename from src/java/template/ajax/tab.ftl
rename to action/src/main/resources/template/ajax/tab.ftl
diff --git a/src/java/template/ajax/textarea.ftl b/action/src/main/resources/template/ajax/textarea.ftl
similarity index 100%
rename from src/java/template/ajax/textarea.ftl
rename to action/src/main/resources/template/ajax/textarea.ftl
diff --git a/src/java/template/ajax/theme.properties b/action/src/main/resources/template/ajax/theme.properties
similarity index 100%
rename from src/java/template/ajax/theme.properties
rename to action/src/main/resources/template/ajax/theme.properties
diff --git a/src/java/template/ajax/tree-close.ftl b/action/src/main/resources/template/ajax/tree-close.ftl
similarity index 100%
rename from src/java/template/ajax/tree-close.ftl
rename to action/src/main/resources/template/ajax/tree-close.ftl
diff --git a/src/java/template/ajax/tree.ftl b/action/src/main/resources/template/ajax/tree.ftl
similarity index 100%
rename from src/java/template/ajax/tree.ftl
rename to action/src/main/resources/template/ajax/tree.ftl
diff --git a/src/java/template/ajax/treenode-close.ftl b/action/src/main/resources/template/ajax/treenode-close.ftl
similarity index 100%
rename from src/java/template/ajax/treenode-close.ftl
rename to action/src/main/resources/template/ajax/treenode-close.ftl
diff --git a/src/java/template/ajax/treenode-include.ftl b/action/src/main/resources/template/ajax/treenode-include.ftl
similarity index 100%
rename from src/java/template/ajax/treenode-include.ftl
rename to action/src/main/resources/template/ajax/treenode-include.ftl
diff --git a/src/java/template/ajax/treenode.ftl b/action/src/main/resources/template/ajax/treenode.ftl
similarity index 100%
rename from src/java/template/ajax/treenode.ftl
rename to action/src/main/resources/template/ajax/treenode.ftl
diff --git a/src/java/template/ajax/validation.js b/action/src/main/resources/template/ajax/validation.js
similarity index 100%
rename from src/java/template/ajax/validation.js
rename to action/src/main/resources/template/ajax/validation.js
diff --git a/src/java/template/archive/ajax/a-close.vm b/action/src/main/resources/template/archive/ajax/a-close.vm
similarity index 100%
rename from src/java/template/archive/ajax/a-close.vm
rename to action/src/main/resources/template/archive/ajax/a-close.vm
diff --git a/src/java/template/archive/ajax/a.vm b/action/src/main/resources/template/archive/ajax/a.vm
similarity index 100%
rename from src/java/template/archive/ajax/a.vm
rename to action/src/main/resources/template/archive/ajax/a.vm
diff --git a/src/java/template/archive/ajax/div-close.vm b/action/src/main/resources/template/archive/ajax/div-close.vm
similarity index 100%
rename from src/java/template/archive/ajax/div-close.vm
rename to action/src/main/resources/template/archive/ajax/div-close.vm
diff --git a/src/java/template/archive/ajax/div.vm b/action/src/main/resources/template/archive/ajax/div.vm
similarity index 100%
rename from src/java/template/archive/ajax/div.vm
rename to action/src/main/resources/template/archive/ajax/div.vm
diff --git a/src/java/template/archive/ajax/form-close.vm b/action/src/main/resources/template/archive/ajax/form-close.vm
similarity index 100%
rename from src/java/template/archive/ajax/form-close.vm
rename to action/src/main/resources/template/archive/ajax/form-close.vm
diff --git a/src/java/template/archive/ajax/form.vm b/action/src/main/resources/template/archive/ajax/form.vm
similarity index 100%
rename from src/java/template/archive/ajax/form.vm
rename to action/src/main/resources/template/archive/ajax/form.vm
diff --git a/src/java/template/archive/ajax/submit.vm b/action/src/main/resources/template/archive/ajax/submit.vm
similarity index 100%
rename from src/java/template/archive/ajax/submit.vm
rename to action/src/main/resources/template/archive/ajax/submit.vm
diff --git a/src/java/template/archive/ajax/tab-close.vm b/action/src/main/resources/template/archive/ajax/tab-close.vm
similarity index 100%
rename from src/java/template/archive/ajax/tab-close.vm
rename to action/src/main/resources/template/archive/ajax/tab-close.vm
diff --git a/src/java/template/archive/ajax/tab.vm b/action/src/main/resources/template/archive/ajax/tab.vm
similarity index 100%
rename from src/java/template/archive/ajax/tab.vm
rename to action/src/main/resources/template/archive/ajax/tab.vm
diff --git a/src/java/template/archive/simple/checkbox.vm b/action/src/main/resources/template/archive/simple/checkbox.vm
similarity index 100%
rename from src/java/template/archive/simple/checkbox.vm
rename to action/src/main/resources/template/archive/simple/checkbox.vm
diff --git a/src/java/template/archive/simple/checkboxlist.vm b/action/src/main/resources/template/archive/simple/checkboxlist.vm
similarity index 100%
rename from src/java/template/archive/simple/checkboxlist.vm
rename to action/src/main/resources/template/archive/simple/checkboxlist.vm
diff --git a/src/java/template/archive/simple/combobox.vm b/action/src/main/resources/template/archive/simple/combobox.vm
similarity index 100%
rename from src/java/template/archive/simple/combobox.vm
rename to action/src/main/resources/template/archive/simple/combobox.vm
diff --git a/src/java/template/archive/simple/debug.vm b/action/src/main/resources/template/archive/simple/debug.vm
similarity index 100%
rename from src/java/template/archive/simple/debug.vm
rename to action/src/main/resources/template/archive/simple/debug.vm
diff --git a/src/java/template/archive/simple/doubleselect.vm b/action/src/main/resources/template/archive/simple/doubleselect.vm
similarity index 100%
rename from src/java/template/archive/simple/doubleselect.vm
rename to action/src/main/resources/template/archive/simple/doubleselect.vm
diff --git a/src/java/template/archive/simple/empty.vm b/action/src/main/resources/template/archive/simple/empty.vm
similarity index 100%
rename from src/java/template/archive/simple/empty.vm
rename to action/src/main/resources/template/archive/simple/empty.vm
diff --git a/src/java/template/archive/simple/file.vm b/action/src/main/resources/template/archive/simple/file.vm
similarity index 100%
rename from src/java/template/archive/simple/file.vm
rename to action/src/main/resources/template/archive/simple/file.vm
diff --git a/src/java/template/archive/simple/form-close.vm b/action/src/main/resources/template/archive/simple/form-close.vm
similarity index 100%
rename from src/java/template/archive/simple/form-close.vm
rename to action/src/main/resources/template/archive/simple/form-close.vm
diff --git a/src/java/template/archive/simple/form.vm b/action/src/main/resources/template/archive/simple/form.vm
similarity index 100%
rename from src/java/template/archive/simple/form.vm
rename to action/src/main/resources/template/archive/simple/form.vm
diff --git a/src/java/template/archive/simple/hidden.vm b/action/src/main/resources/template/archive/simple/hidden.vm
similarity index 100%
rename from src/java/template/archive/simple/hidden.vm
rename to action/src/main/resources/template/archive/simple/hidden.vm
diff --git a/src/java/template/archive/simple/label.vm b/action/src/main/resources/template/archive/simple/label.vm
similarity index 100%
rename from src/java/template/archive/simple/label.vm
rename to action/src/main/resources/template/archive/simple/label.vm
diff --git a/src/java/template/archive/simple/password.vm b/action/src/main/resources/template/archive/simple/password.vm
similarity index 100%
rename from src/java/template/archive/simple/password.vm
rename to action/src/main/resources/template/archive/simple/password.vm
diff --git a/src/java/template/archive/simple/radiomap.vm b/action/src/main/resources/template/archive/simple/radiomap.vm
similarity index 100%
rename from src/java/template/archive/simple/radiomap.vm
rename to action/src/main/resources/template/archive/simple/radiomap.vm
diff --git a/src/java/template/archive/simple/scripting-events.vm b/action/src/main/resources/template/archive/simple/scripting-events.vm
similarity index 100%
rename from src/java/template/archive/simple/scripting-events.vm
rename to action/src/main/resources/template/archive/simple/scripting-events.vm
diff --git a/src/java/template/archive/simple/select.vm b/action/src/main/resources/template/archive/simple/select.vm
similarity index 100%
rename from src/java/template/archive/simple/select.vm
rename to action/src/main/resources/template/archive/simple/select.vm
diff --git a/src/java/template/archive/simple/submit.vm b/action/src/main/resources/template/archive/simple/submit.vm
similarity index 100%
rename from src/java/template/archive/simple/submit.vm
rename to action/src/main/resources/template/archive/simple/submit.vm
diff --git a/src/java/template/archive/simple/tabbedpane.vm b/action/src/main/resources/template/archive/simple/tabbedpane.vm
similarity index 100%
rename from src/java/template/archive/simple/tabbedpane.vm
rename to action/src/main/resources/template/archive/simple/tabbedpane.vm
diff --git a/src/java/template/archive/simple/table.vm b/action/src/main/resources/template/archive/simple/table.vm
similarity index 100%
rename from src/java/template/archive/simple/table.vm
rename to action/src/main/resources/template/archive/simple/table.vm
diff --git a/src/java/template/archive/simple/text.vm b/action/src/main/resources/template/archive/simple/text.vm
similarity index 100%
rename from src/java/template/archive/simple/text.vm
rename to action/src/main/resources/template/archive/simple/text.vm
diff --git a/src/java/template/archive/simple/textarea.vm b/action/src/main/resources/template/archive/simple/textarea.vm
similarity index 100%
rename from src/java/template/archive/simple/textarea.vm
rename to action/src/main/resources/template/archive/simple/textarea.vm
diff --git a/src/java/template/archive/simple/token.vm b/action/src/main/resources/template/archive/simple/token.vm
similarity index 100%
rename from src/java/template/archive/simple/token.vm
rename to action/src/main/resources/template/archive/simple/token.vm
diff --git a/src/java/template/archive/xhtml/checkbox.vm b/action/src/main/resources/template/archive/xhtml/checkbox.vm
similarity index 100%
rename from src/java/template/archive/xhtml/checkbox.vm
rename to action/src/main/resources/template/archive/xhtml/checkbox.vm
diff --git a/src/java/template/archive/xhtml/checkboxlist.vm b/action/src/main/resources/template/archive/xhtml/checkboxlist.vm
similarity index 100%
rename from src/java/template/archive/xhtml/checkboxlist.vm
rename to action/src/main/resources/template/archive/xhtml/checkboxlist.vm
diff --git a/src/java/template/archive/xhtml/combobox.vm b/action/src/main/resources/template/archive/xhtml/combobox.vm
similarity index 100%
rename from src/java/template/archive/xhtml/combobox.vm
rename to action/src/main/resources/template/archive/xhtml/combobox.vm
diff --git a/src/java/template/archive/xhtml/controlfooter.vm b/action/src/main/resources/template/archive/xhtml/controlfooter.vm
similarity index 100%
rename from src/java/template/archive/xhtml/controlfooter.vm
rename to action/src/main/resources/template/archive/xhtml/controlfooter.vm
diff --git a/src/java/template/archive/xhtml/controlheader.vm b/action/src/main/resources/template/archive/xhtml/controlheader.vm
similarity index 100%
rename from src/java/template/archive/xhtml/controlheader.vm
rename to action/src/main/resources/template/archive/xhtml/controlheader.vm
diff --git a/src/java/template/archive/xhtml/debug.vm b/action/src/main/resources/template/archive/xhtml/debug.vm
similarity index 100%
rename from src/java/template/archive/xhtml/debug.vm
rename to action/src/main/resources/template/archive/xhtml/debug.vm
diff --git a/src/java/template/archive/xhtml/doubleselect.vm b/action/src/main/resources/template/archive/xhtml/doubleselect.vm
similarity index 100%
rename from src/java/template/archive/xhtml/doubleselect.vm
rename to action/src/main/resources/template/archive/xhtml/doubleselect.vm
diff --git a/src/java/template/archive/xhtml/empty.vm b/action/src/main/resources/template/archive/xhtml/empty.vm
similarity index 100%
rename from src/java/template/archive/xhtml/empty.vm
rename to action/src/main/resources/template/archive/xhtml/empty.vm
diff --git a/src/java/template/archive/xhtml/file.vm b/action/src/main/resources/template/archive/xhtml/file.vm
similarity index 100%
rename from src/java/template/archive/xhtml/file.vm
rename to action/src/main/resources/template/archive/xhtml/file.vm
diff --git a/src/java/template/archive/xhtml/form-close.vm b/action/src/main/resources/template/archive/xhtml/form-close.vm
similarity index 100%
rename from src/java/template/archive/xhtml/form-close.vm
rename to action/src/main/resources/template/archive/xhtml/form-close.vm
diff --git a/src/java/template/archive/xhtml/form.vm b/action/src/main/resources/template/archive/xhtml/form.vm
similarity index 100%
rename from src/java/template/archive/xhtml/form.vm
rename to action/src/main/resources/template/archive/xhtml/form.vm
diff --git a/src/java/template/archive/xhtml/hidden.vm b/action/src/main/resources/template/archive/xhtml/hidden.vm
similarity index 100%
rename from src/java/template/archive/xhtml/hidden.vm
rename to action/src/main/resources/template/archive/xhtml/hidden.vm
diff --git a/src/java/template/archive/xhtml/label.vm b/action/src/main/resources/template/archive/xhtml/label.vm
similarity index 100%
rename from src/java/template/archive/xhtml/label.vm
rename to action/src/main/resources/template/archive/xhtml/label.vm
diff --git a/src/java/template/archive/xhtml/password.vm b/action/src/main/resources/template/archive/xhtml/password.vm
similarity index 100%
rename from src/java/template/archive/xhtml/password.vm
rename to action/src/main/resources/template/archive/xhtml/password.vm
diff --git a/src/java/template/archive/xhtml/radiomap.vm b/action/src/main/resources/template/archive/xhtml/radiomap.vm
similarity index 100%
rename from src/java/template/archive/xhtml/radiomap.vm
rename to action/src/main/resources/template/archive/xhtml/radiomap.vm
diff --git a/src/java/template/archive/xhtml/select.vm b/action/src/main/resources/template/archive/xhtml/select.vm
similarity index 100%
rename from src/java/template/archive/xhtml/select.vm
rename to action/src/main/resources/template/archive/xhtml/select.vm
diff --git a/src/java/template/archive/xhtml/submit.vm b/action/src/main/resources/template/archive/xhtml/submit.vm
similarity index 100%
rename from src/java/template/archive/xhtml/submit.vm
rename to action/src/main/resources/template/archive/xhtml/submit.vm
diff --git a/src/java/template/archive/xhtml/tabbedpane.vm b/action/src/main/resources/template/archive/xhtml/tabbedpane.vm
similarity index 100%
rename from src/java/template/archive/xhtml/tabbedpane.vm
rename to action/src/main/resources/template/archive/xhtml/tabbedpane.vm
diff --git a/src/java/template/archive/xhtml/table.vm b/action/src/main/resources/template/archive/xhtml/table.vm
similarity index 100%
rename from src/java/template/archive/xhtml/table.vm
rename to action/src/main/resources/template/archive/xhtml/table.vm
diff --git a/src/java/template/archive/xhtml/text.vm b/action/src/main/resources/template/archive/xhtml/text.vm
similarity index 100%
rename from src/java/template/archive/xhtml/text.vm
rename to action/src/main/resources/template/archive/xhtml/text.vm
diff --git a/src/java/template/archive/xhtml/textarea.vm b/action/src/main/resources/template/archive/xhtml/textarea.vm
similarity index 100%
rename from src/java/template/archive/xhtml/textarea.vm
rename to action/src/main/resources/template/archive/xhtml/textarea.vm
diff --git a/src/java/template/archive/xhtml/token.vm b/action/src/main/resources/template/archive/xhtml/token.vm
similarity index 100%
rename from src/java/template/archive/xhtml/token.vm
rename to action/src/main/resources/template/archive/xhtml/token.vm
diff --git a/src/java/template/css_xhtml/checkbox.ftl b/action/src/main/resources/template/css_xhtml/checkbox.ftl
similarity index 100%
rename from src/java/template/css_xhtml/checkbox.ftl
rename to action/src/main/resources/template/css_xhtml/checkbox.ftl
diff --git a/src/java/template/css_xhtml/checkboxlist.ftl b/action/src/main/resources/template/css_xhtml/checkboxlist.ftl
similarity index 100%
rename from src/java/template/css_xhtml/checkboxlist.ftl
rename to action/src/main/resources/template/css_xhtml/checkboxlist.ftl
diff --git a/src/java/template/css_xhtml/combobox.ftl b/action/src/main/resources/template/css_xhtml/combobox.ftl
similarity index 100%
rename from src/java/template/css_xhtml/combobox.ftl
rename to action/src/main/resources/template/css_xhtml/combobox.ftl
diff --git a/src/java/template/css_xhtml/controlfooter.ftl b/action/src/main/resources/template/css_xhtml/controlfooter.ftl
similarity index 100%
rename from src/java/template/css_xhtml/controlfooter.ftl
rename to action/src/main/resources/template/css_xhtml/controlfooter.ftl
diff --git a/src/java/template/css_xhtml/controlheader.ftl b/action/src/main/resources/template/css_xhtml/controlheader.ftl
similarity index 100%
rename from src/java/template/css_xhtml/controlheader.ftl
rename to action/src/main/resources/template/css_xhtml/controlheader.ftl
diff --git a/src/java/template/css_xhtml/datepicker.ftl b/action/src/main/resources/template/css_xhtml/datepicker.ftl
similarity index 100%
rename from src/java/template/css_xhtml/datepicker.ftl
rename to action/src/main/resources/template/css_xhtml/datepicker.ftl
diff --git a/src/java/template/css_xhtml/debug.ftl b/action/src/main/resources/template/css_xhtml/debug.ftl
similarity index 100%
rename from src/java/template/css_xhtml/debug.ftl
rename to action/src/main/resources/template/css_xhtml/debug.ftl
diff --git a/src/java/template/css_xhtml/doubleselect.ftl b/action/src/main/resources/template/css_xhtml/doubleselect.ftl
similarity index 100%
rename from src/java/template/css_xhtml/doubleselect.ftl
rename to action/src/main/resources/template/css_xhtml/doubleselect.ftl
diff --git a/src/java/template/css_xhtml/file.ftl b/action/src/main/resources/template/css_xhtml/file.ftl
similarity index 100%
rename from src/java/template/css_xhtml/file.ftl
rename to action/src/main/resources/template/css_xhtml/file.ftl
diff --git a/src/java/template/css_xhtml/form-close.ftl b/action/src/main/resources/template/css_xhtml/form-close.ftl
similarity index 100%
rename from src/java/template/css_xhtml/form-close.ftl
rename to action/src/main/resources/template/css_xhtml/form-close.ftl
diff --git a/src/java/template/css_xhtml/form-validate.ftl b/action/src/main/resources/template/css_xhtml/form-validate.ftl
similarity index 100%
rename from src/java/template/css_xhtml/form-validate.ftl
rename to action/src/main/resources/template/css_xhtml/form-validate.ftl
diff --git a/src/java/template/css_xhtml/form.ftl b/action/src/main/resources/template/css_xhtml/form.ftl
similarity index 100%
rename from src/java/template/css_xhtml/form.ftl
rename to action/src/main/resources/template/css_xhtml/form.ftl
diff --git a/src/java/template/css_xhtml/head.ftl b/action/src/main/resources/template/css_xhtml/head.ftl
similarity index 100%
rename from src/java/template/css_xhtml/head.ftl
rename to action/src/main/resources/template/css_xhtml/head.ftl
diff --git a/src/java/template/css_xhtml/label.ftl b/action/src/main/resources/template/css_xhtml/label.ftl
similarity index 100%
rename from src/java/template/css_xhtml/label.ftl
rename to action/src/main/resources/template/css_xhtml/label.ftl
diff --git a/src/java/template/css_xhtml/optiontransferselect.ftl b/action/src/main/resources/template/css_xhtml/optiontransferselect.ftl
similarity index 100%
rename from src/java/template/css_xhtml/optiontransferselect.ftl
rename to action/src/main/resources/template/css_xhtml/optiontransferselect.ftl
diff --git a/src/java/template/css_xhtml/password.ftl b/action/src/main/resources/template/css_xhtml/password.ftl
similarity index 100%
rename from src/java/template/css_xhtml/password.ftl
rename to action/src/main/resources/template/css_xhtml/password.ftl
diff --git a/src/java/template/css_xhtml/radiomap.ftl b/action/src/main/resources/template/css_xhtml/radiomap.ftl
similarity index 100%
rename from src/java/template/css_xhtml/radiomap.ftl
rename to action/src/main/resources/template/css_xhtml/radiomap.ftl
diff --git a/src/java/template/css_xhtml/reset.ftl b/action/src/main/resources/template/css_xhtml/reset.ftl
similarity index 100%
rename from src/java/template/css_xhtml/reset.ftl
rename to action/src/main/resources/template/css_xhtml/reset.ftl
diff --git a/src/java/template/css_xhtml/richtexteditor.ftl b/action/src/main/resources/template/css_xhtml/richtexteditor.ftl
similarity index 100%
rename from src/java/template/css_xhtml/richtexteditor.ftl
rename to action/src/main/resources/template/css_xhtml/richtexteditor.ftl
diff --git a/src/java/template/css_xhtml/select.ftl b/action/src/main/resources/template/css_xhtml/select.ftl
similarity index 100%
rename from src/java/template/css_xhtml/select.ftl
rename to action/src/main/resources/template/css_xhtml/select.ftl
diff --git a/src/java/template/css_xhtml/styles.css b/action/src/main/resources/template/css_xhtml/styles.css
similarity index 100%
rename from src/java/template/css_xhtml/styles.css
rename to action/src/main/resources/template/css_xhtml/styles.css
diff --git a/src/java/template/css_xhtml/submit.ftl b/action/src/main/resources/template/css_xhtml/submit.ftl
similarity index 100%
rename from src/java/template/css_xhtml/submit.ftl
rename to action/src/main/resources/template/css_xhtml/submit.ftl
diff --git a/src/java/template/css_xhtml/text.ftl b/action/src/main/resources/template/css_xhtml/text.ftl
similarity index 100%
rename from src/java/template/css_xhtml/text.ftl
rename to action/src/main/resources/template/css_xhtml/text.ftl
diff --git a/src/java/template/css_xhtml/textarea.ftl b/action/src/main/resources/template/css_xhtml/textarea.ftl
similarity index 100%
rename from src/java/template/css_xhtml/textarea.ftl
rename to action/src/main/resources/template/css_xhtml/textarea.ftl
diff --git a/src/java/template/css_xhtml/theme.properties b/action/src/main/resources/template/css_xhtml/theme.properties
similarity index 100%
rename from src/java/template/css_xhtml/theme.properties
rename to action/src/main/resources/template/css_xhtml/theme.properties
diff --git a/src/java/template/css_xhtml/updownselect.ftl b/action/src/main/resources/template/css_xhtml/updownselect.ftl
similarity index 100%
rename from src/java/template/css_xhtml/updownselect.ftl
rename to action/src/main/resources/template/css_xhtml/updownselect.ftl
diff --git a/src/java/template/css_xhtml/validation.js b/action/src/main/resources/template/css_xhtml/validation.js
similarity index 100%
rename from src/java/template/css_xhtml/validation.js
rename to action/src/main/resources/template/css_xhtml/validation.js
diff --git a/src/java/template/simple/a-close.ftl b/action/src/main/resources/template/simple/a-close.ftl
similarity index 100%
rename from src/java/template/simple/a-close.ftl
rename to action/src/main/resources/template/simple/a-close.ftl
diff --git a/src/java/template/simple/a.ftl b/action/src/main/resources/template/simple/a.ftl
similarity index 100%
rename from src/java/template/simple/a.ftl
rename to action/src/main/resources/template/simple/a.ftl
diff --git a/src/java/template/simple/actionerror.ftl b/action/src/main/resources/template/simple/actionerror.ftl
similarity index 100%
rename from src/java/template/simple/actionerror.ftl
rename to action/src/main/resources/template/simple/actionerror.ftl
diff --git a/src/java/template/simple/actionmessage.ftl b/action/src/main/resources/template/simple/actionmessage.ftl
similarity index 100%
rename from src/java/template/simple/actionmessage.ftl
rename to action/src/main/resources/template/simple/actionmessage.ftl
diff --git a/src/java/template/simple/checkbox.ftl b/action/src/main/resources/template/simple/checkbox.ftl
similarity index 100%
rename from src/java/template/simple/checkbox.ftl
rename to action/src/main/resources/template/simple/checkbox.ftl
diff --git a/src/java/template/simple/checkboxlist.ftl b/action/src/main/resources/template/simple/checkboxlist.ftl
similarity index 100%
rename from src/java/template/simple/checkboxlist.ftl
rename to action/src/main/resources/template/simple/checkboxlist.ftl
diff --git a/src/java/template/simple/combobox.ftl b/action/src/main/resources/template/simple/combobox.ftl
similarity index 100%
rename from src/java/template/simple/combobox.ftl
rename to action/src/main/resources/template/simple/combobox.ftl
diff --git a/src/java/template/simple/controlfooter.ftl b/action/src/main/resources/template/simple/controlfooter.ftl
similarity index 100%
rename from src/java/template/simple/controlfooter.ftl
rename to action/src/main/resources/template/simple/controlfooter.ftl
diff --git a/src/java/template/simple/controlheader.ftl b/action/src/main/resources/template/simple/controlheader.ftl
similarity index 100%
rename from src/java/template/simple/controlheader.ftl
rename to action/src/main/resources/template/simple/controlheader.ftl
diff --git a/src/java/template/simple/datepicker.ftl b/action/src/main/resources/template/simple/datepicker.ftl
similarity index 100%
rename from src/java/template/simple/datepicker.ftl
rename to action/src/main/resources/template/simple/datepicker.ftl
diff --git a/src/java/template/simple/debug.ftl b/action/src/main/resources/template/simple/debug.ftl
similarity index 100%
rename from src/java/template/simple/debug.ftl
rename to action/src/main/resources/template/simple/debug.ftl
diff --git a/src/java/template/simple/div-close.ftl b/action/src/main/resources/template/simple/div-close.ftl
similarity index 100%
rename from src/java/template/simple/div-close.ftl
rename to action/src/main/resources/template/simple/div-close.ftl
diff --git a/src/java/template/simple/div.ftl b/action/src/main/resources/template/simple/div.ftl
similarity index 100%
rename from src/java/template/simple/div.ftl
rename to action/src/main/resources/template/simple/div.ftl
diff --git a/src/java/template/simple/doubleselect.ftl b/action/src/main/resources/template/simple/doubleselect.ftl
similarity index 100%
rename from src/java/template/simple/doubleselect.ftl
rename to action/src/main/resources/template/simple/doubleselect.ftl
diff --git a/src/java/template/simple/fielderror.ftl b/action/src/main/resources/template/simple/fielderror.ftl
similarity index 100%
rename from src/java/template/simple/fielderror.ftl
rename to action/src/main/resources/template/simple/fielderror.ftl
diff --git a/src/java/template/simple/file.ftl b/action/src/main/resources/template/simple/file.ftl
similarity index 100%
rename from src/java/template/simple/file.ftl
rename to action/src/main/resources/template/simple/file.ftl
diff --git a/src/java/template/simple/form-close.ftl b/action/src/main/resources/template/simple/form-close.ftl
similarity index 100%
rename from src/java/template/simple/form-close.ftl
rename to action/src/main/resources/template/simple/form-close.ftl
diff --git a/src/java/template/simple/form.ftl b/action/src/main/resources/template/simple/form.ftl
similarity index 100%
rename from src/java/template/simple/form.ftl
rename to action/src/main/resources/template/simple/form.ftl
diff --git a/src/java/template/simple/head.ftl b/action/src/main/resources/template/simple/head.ftl
similarity index 100%
rename from src/java/template/simple/head.ftl
rename to action/src/main/resources/template/simple/head.ftl
diff --git a/src/java/template/simple/hidden.ftl b/action/src/main/resources/template/simple/hidden.ftl
similarity index 100%
rename from src/java/template/simple/hidden.ftl
rename to action/src/main/resources/template/simple/hidden.ftl
diff --git a/src/java/template/simple/label.ftl b/action/src/main/resources/template/simple/label.ftl
similarity index 100%
rename from src/java/template/simple/label.ftl
rename to action/src/main/resources/template/simple/label.ftl
diff --git a/src/java/template/simple/optiontransferselect.ftl b/action/src/main/resources/template/simple/optiontransferselect.ftl
similarity index 100%
rename from src/java/template/simple/optiontransferselect.ftl
rename to action/src/main/resources/template/simple/optiontransferselect.ftl
diff --git a/src/java/template/simple/password.ftl b/action/src/main/resources/template/simple/password.ftl
similarity index 100%
rename from src/java/template/simple/password.ftl
rename to action/src/main/resources/template/simple/password.ftl
diff --git a/src/java/template/simple/radiomap.ftl b/action/src/main/resources/template/simple/radiomap.ftl
similarity index 100%
rename from src/java/template/simple/radiomap.ftl
rename to action/src/main/resources/template/simple/radiomap.ftl
diff --git a/src/java/template/simple/reset.ftl b/action/src/main/resources/template/simple/reset.ftl
similarity index 100%
rename from src/java/template/simple/reset.ftl
rename to action/src/main/resources/template/simple/reset.ftl
diff --git a/src/java/template/simple/richtexteditor.ftl b/action/src/main/resources/template/simple/richtexteditor.ftl
similarity index 100%
rename from src/java/template/simple/richtexteditor.ftl
rename to action/src/main/resources/template/simple/richtexteditor.ftl
diff --git a/src/java/template/simple/scripting-events.ftl b/action/src/main/resources/template/simple/scripting-events.ftl
similarity index 100%
rename from src/java/template/simple/scripting-events.ftl
rename to action/src/main/resources/template/simple/scripting-events.ftl
diff --git a/src/java/template/simple/select.ftl b/action/src/main/resources/template/simple/select.ftl
similarity index 100%
rename from src/java/template/simple/select.ftl
rename to action/src/main/resources/template/simple/select.ftl
diff --git a/src/java/template/simple/submit.ftl b/action/src/main/resources/template/simple/submit.ftl
similarity index 100%
rename from src/java/template/simple/submit.ftl
rename to action/src/main/resources/template/simple/submit.ftl
diff --git a/src/java/template/simple/tab-close.ftl b/action/src/main/resources/template/simple/tab-close.ftl
similarity index 100%
rename from src/java/template/simple/tab-close.ftl
rename to action/src/main/resources/template/simple/tab-close.ftl
diff --git a/src/java/template/simple/tab.ftl b/action/src/main/resources/template/simple/tab.ftl
similarity index 100%
rename from src/java/template/simple/tab.ftl
rename to action/src/main/resources/template/simple/tab.ftl
diff --git a/src/java/template/simple/tabbedpanel-close.ftl b/action/src/main/resources/template/simple/tabbedpanel-close.ftl
similarity index 100%
rename from src/java/template/simple/tabbedpanel-close.ftl
rename to action/src/main/resources/template/simple/tabbedpanel-close.ftl
diff --git a/src/java/template/simple/tabbedpanel.ftl b/action/src/main/resources/template/simple/tabbedpanel.ftl
similarity index 100%
rename from src/java/template/simple/tabbedpanel.ftl
rename to action/src/main/resources/template/simple/tabbedpanel.ftl
diff --git a/src/java/template/simple/table.ftl b/action/src/main/resources/template/simple/table.ftl
similarity index 100%
rename from src/java/template/simple/table.ftl
rename to action/src/main/resources/template/simple/table.ftl
diff --git a/src/java/template/simple/text.ftl b/action/src/main/resources/template/simple/text.ftl
similarity index 100%
rename from src/java/template/simple/text.ftl
rename to action/src/main/resources/template/simple/text.ftl
diff --git a/src/java/template/simple/textarea.ftl b/action/src/main/resources/template/simple/textarea.ftl
similarity index 100%
rename from src/java/template/simple/textarea.ftl
rename to action/src/main/resources/template/simple/textarea.ftl
diff --git a/src/java/template/simple/token.ftl b/action/src/main/resources/template/simple/token.ftl
similarity index 100%
rename from src/java/template/simple/token.ftl
rename to action/src/main/resources/template/simple/token.ftl
diff --git a/src/java/template/simple/updownselect.ftl b/action/src/main/resources/template/simple/updownselect.ftl
similarity index 100%
rename from src/java/template/simple/updownselect.ftl
rename to action/src/main/resources/template/simple/updownselect.ftl
diff --git a/src/java/template/xhtml/checkbox.ftl b/action/src/main/resources/template/xhtml/checkbox.ftl
similarity index 100%
rename from src/java/template/xhtml/checkbox.ftl
rename to action/src/main/resources/template/xhtml/checkbox.ftl
diff --git a/src/java/template/xhtml/checkboxlist.ftl b/action/src/main/resources/template/xhtml/checkboxlist.ftl
similarity index 100%
rename from src/java/template/xhtml/checkboxlist.ftl
rename to action/src/main/resources/template/xhtml/checkboxlist.ftl
diff --git a/src/java/template/xhtml/combobox.ftl b/action/src/main/resources/template/xhtml/combobox.ftl
similarity index 100%
rename from src/java/template/xhtml/combobox.ftl
rename to action/src/main/resources/template/xhtml/combobox.ftl
diff --git a/src/java/template/xhtml/controlfooter.ftl b/action/src/main/resources/template/xhtml/controlfooter.ftl
similarity index 100%
rename from src/java/template/xhtml/controlfooter.ftl
rename to action/src/main/resources/template/xhtml/controlfooter.ftl
diff --git a/src/java/template/xhtml/controlheader-core.ftl b/action/src/main/resources/template/xhtml/controlheader-core.ftl
similarity index 100%
rename from src/java/template/xhtml/controlheader-core.ftl
rename to action/src/main/resources/template/xhtml/controlheader-core.ftl
diff --git a/src/java/template/xhtml/controlheader.ftl b/action/src/main/resources/template/xhtml/controlheader.ftl
similarity index 100%
rename from src/java/template/xhtml/controlheader.ftl
rename to action/src/main/resources/template/xhtml/controlheader.ftl
diff --git a/src/java/template/xhtml/datepicker.ftl b/action/src/main/resources/template/xhtml/datepicker.ftl
similarity index 100%
rename from src/java/template/xhtml/datepicker.ftl
rename to action/src/main/resources/template/xhtml/datepicker.ftl
diff --git a/src/java/template/xhtml/debug.ftl b/action/src/main/resources/template/xhtml/debug.ftl
similarity index 100%
rename from src/java/template/xhtml/debug.ftl
rename to action/src/main/resources/template/xhtml/debug.ftl
diff --git a/src/java/template/xhtml/doubleselect.ftl b/action/src/main/resources/template/xhtml/doubleselect.ftl
similarity index 100%
rename from src/java/template/xhtml/doubleselect.ftl
rename to action/src/main/resources/template/xhtml/doubleselect.ftl
diff --git a/src/java/template/xhtml/empty.ftl b/action/src/main/resources/template/xhtml/empty.ftl
similarity index 100%
rename from src/java/template/xhtml/empty.ftl
rename to action/src/main/resources/template/xhtml/empty.ftl
diff --git a/src/java/template/xhtml/file.ftl b/action/src/main/resources/template/xhtml/file.ftl
similarity index 100%
rename from src/java/template/xhtml/file.ftl
rename to action/src/main/resources/template/xhtml/file.ftl
diff --git a/src/java/template/xhtml/form-close-validate.ftl b/action/src/main/resources/template/xhtml/form-close-validate.ftl
similarity index 100%
rename from src/java/template/xhtml/form-close-validate.ftl
rename to action/src/main/resources/template/xhtml/form-close-validate.ftl
diff --git a/src/java/template/xhtml/form-close.ftl b/action/src/main/resources/template/xhtml/form-close.ftl
similarity index 100%
rename from src/java/template/xhtml/form-close.ftl
rename to action/src/main/resources/template/xhtml/form-close.ftl
diff --git a/src/java/template/xhtml/form-validate.ftl b/action/src/main/resources/template/xhtml/form-validate.ftl
similarity index 100%
rename from src/java/template/xhtml/form-validate.ftl
rename to action/src/main/resources/template/xhtml/form-validate.ftl
diff --git a/src/java/template/xhtml/form.ftl b/action/src/main/resources/template/xhtml/form.ftl
similarity index 100%
rename from src/java/template/xhtml/form.ftl
rename to action/src/main/resources/template/xhtml/form.ftl
diff --git a/src/java/template/xhtml/head.ftl b/action/src/main/resources/template/xhtml/head.ftl
similarity index 100%
rename from src/java/template/xhtml/head.ftl
rename to action/src/main/resources/template/xhtml/head.ftl
diff --git a/src/java/template/xhtml/label.ftl b/action/src/main/resources/template/xhtml/label.ftl
similarity index 100%
rename from src/java/template/xhtml/label.ftl
rename to action/src/main/resources/template/xhtml/label.ftl
diff --git a/src/java/template/xhtml/optiontransferselect.ftl b/action/src/main/resources/template/xhtml/optiontransferselect.ftl
similarity index 100%
rename from src/java/template/xhtml/optiontransferselect.ftl
rename to action/src/main/resources/template/xhtml/optiontransferselect.ftl
diff --git a/src/java/template/xhtml/password.ftl b/action/src/main/resources/template/xhtml/password.ftl
similarity index 100%
rename from src/java/template/xhtml/password.ftl
rename to action/src/main/resources/template/xhtml/password.ftl
diff --git a/src/java/template/xhtml/radiomap.ftl b/action/src/main/resources/template/xhtml/radiomap.ftl
similarity index 100%
rename from src/java/template/xhtml/radiomap.ftl
rename to action/src/main/resources/template/xhtml/radiomap.ftl
diff --git a/src/java/template/xhtml/reset.ftl b/action/src/main/resources/template/xhtml/reset.ftl
similarity index 100%
rename from src/java/template/xhtml/reset.ftl
rename to action/src/main/resources/template/xhtml/reset.ftl
diff --git a/src/java/template/xhtml/richtexteditor.ftl b/action/src/main/resources/template/xhtml/richtexteditor.ftl
similarity index 100%
rename from src/java/template/xhtml/richtexteditor.ftl
rename to action/src/main/resources/template/xhtml/richtexteditor.ftl
diff --git a/src/java/template/xhtml/select.ftl b/action/src/main/resources/template/xhtml/select.ftl
similarity index 100%
rename from src/java/template/xhtml/select.ftl
rename to action/src/main/resources/template/xhtml/select.ftl
diff --git a/src/java/template/xhtml/styles.css b/action/src/main/resources/template/xhtml/styles.css
similarity index 100%
rename from src/java/template/xhtml/styles.css
rename to action/src/main/resources/template/xhtml/styles.css
diff --git a/src/java/template/xhtml/submit.ftl b/action/src/main/resources/template/xhtml/submit.ftl
similarity index 100%
rename from src/java/template/xhtml/submit.ftl
rename to action/src/main/resources/template/xhtml/submit.ftl
diff --git a/src/java/template/xhtml/text.ftl b/action/src/main/resources/template/xhtml/text.ftl
similarity index 100%
rename from src/java/template/xhtml/text.ftl
rename to action/src/main/resources/template/xhtml/text.ftl
diff --git a/src/java/template/xhtml/textarea.ftl b/action/src/main/resources/template/xhtml/textarea.ftl
similarity index 100%
rename from src/java/template/xhtml/textarea.ftl
rename to action/src/main/resources/template/xhtml/textarea.ftl
diff --git a/src/java/template/xhtml/theme.properties b/action/src/main/resources/template/xhtml/theme.properties
similarity index 100%
rename from src/java/template/xhtml/theme.properties
rename to action/src/main/resources/template/xhtml/theme.properties
diff --git a/src/java/template/xhtml/tooltip.ftl b/action/src/main/resources/template/xhtml/tooltip.ftl
similarity index 100%
rename from src/java/template/xhtml/tooltip.ftl
rename to action/src/main/resources/template/xhtml/tooltip.ftl
diff --git a/src/java/template/xhtml/updownselect.ftl b/action/src/main/resources/template/xhtml/updownselect.ftl
similarity index 100%
rename from src/java/template/xhtml/updownselect.ftl
rename to action/src/main/resources/template/xhtml/updownselect.ftl
diff --git a/src/java/template/xhtml/validation.js b/action/src/main/resources/template/xhtml/validation.js
similarity index 100%
rename from src/java/template/xhtml/validation.js
rename to action/src/main/resources/template/xhtml/validation.js
diff --git a/src/xdt/Readme-tagdoclet.txt b/action/src/main/xdt/Readme-tagdoclet.txt
similarity index 100%
rename from src/xdt/Readme-tagdoclet.txt
rename to action/src/main/xdt/Readme-tagdoclet.txt
diff --git a/src/xdt/tagdoc-toc.xdt b/action/src/main/xdt/tagdoc-toc.xdt
similarity index 100%
rename from src/xdt/tagdoc-toc.xdt
rename to action/src/main/xdt/tagdoc-toc.xdt
diff --git a/src/xdt/tagdoc.xdt b/action/src/main/xdt/tagdoc.xdt
similarity index 100%
rename from src/xdt/tagdoc.xdt
rename to action/src/main/xdt/tagdoc.xdt
diff --git a/src/xdt/taglib_tld.xdt b/action/src/main/xdt/taglib_tld.xdt
similarity index 100%
rename from src/xdt/taglib_tld.xdt
rename to action/src/main/xdt/taglib_tld.xdt
diff --git a/src/test/org/apache/struts/action2/ExecutionCountTestAction.java b/action/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java
similarity index 100%
rename from src/test/org/apache/struts/action2/ExecutionCountTestAction.java
rename to action/src/test/java/org/apache/struts/action2/ExecutionCountTestAction.java
diff --git a/src/test/org/apache/struts/action2/RequestUtilsTest.java b/action/src/test/java/org/apache/struts/action2/RequestUtilsTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/RequestUtilsTest.java
rename to action/src/test/java/org/apache/struts/action2/RequestUtilsTest.java
diff --git a/src/test/org/apache/struts/action2/ServletActionContextTest.java b/action/src/test/java/org/apache/struts/action2/ServletActionContextTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/ServletActionContextTest.java
rename to action/src/test/java/org/apache/struts/action2/ServletActionContextTest.java
diff --git a/src/test/org/apache/struts/action2/TestAction.java b/action/src/test/java/org/apache/struts/action2/TestAction.java
similarity index 100%
rename from src/test/org/apache/struts/action2/TestAction.java
rename to action/src/test/java/org/apache/struts/action2/TestAction.java
diff --git a/src/test/org/apache/struts/action2/TestActionTagResult.java b/action/src/test/java/org/apache/struts/action2/TestActionTagResult.java
similarity index 100%
rename from src/test/org/apache/struts/action2/TestActionTagResult.java
rename to action/src/test/java/org/apache/struts/action2/TestActionTagResult.java
diff --git a/src/test/org/apache/struts/action2/TestConfigurationProvider.java b/action/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java
similarity index 100%
rename from src/test/org/apache/struts/action2/TestConfigurationProvider.java
rename to action/src/test/java/org/apache/struts/action2/TestConfigurationProvider.java
diff --git a/src/test/org/apache/struts/action2/TestResult.java b/action/src/test/java/org/apache/struts/action2/TestResult.java
similarity index 100%
rename from src/test/org/apache/struts/action2/TestResult.java
rename to action/src/test/java/org/apache/struts/action2/TestResult.java
diff --git a/src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java b/action/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
rename to action/src/test/java/org/apache/struts/action2/components/AbstractRichtexteditorConnectorTest.java
diff --git a/src/test/org/apache/struts/action2/components/ComponentTest.java b/action/src/test/java/org/apache/struts/action2/components/ComponentTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/ComponentTest.java
rename to action/src/test/java/org/apache/struts/action2/components/ComponentTest.java
diff --git a/src/test/org/apache/struts/action2/components/FormTest.java b/action/src/test/java/org/apache/struts/action2/components/FormTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/FormTest.java
rename to action/src/test/java/org/apache/struts/action2/components/FormTest.java
diff --git a/src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java b/action/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/MockRichtexteditorConnector.java
rename to action/src/test/java/org/apache/struts/action2/components/MockRichtexteditorConnector.java
diff --git a/src/test/org/apache/struts/action2/components/PropertyTest.java b/action/src/test/java/org/apache/struts/action2/components/PropertyTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/PropertyTest.java
rename to action/src/test/java/org/apache/struts/action2/components/PropertyTest.java
diff --git a/src/test/org/apache/struts/action2/components/UIComponentTest.java b/action/src/test/java/org/apache/struts/action2/components/UIComponentTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/components/UIComponentTest.java
rename to action/src/test/java/org/apache/struts/action2/components/UIComponentTest.java
diff --git a/src/test/org/apache/struts/action2/config/ConfigurationTest.java b/action/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/config/ConfigurationTest.java
rename to action/src/test/java/org/apache/struts/action2/config/ConfigurationTest.java
diff --git a/src/test/org/apache/struts/action2/config/TestConfiguration.java b/action/src/test/java/org/apache/struts/action2/config/TestConfiguration.java
similarity index 100%
rename from src/test/org/apache/struts/action2/config/TestConfiguration.java
rename to action/src/test/java/org/apache/struts/action2/config/TestConfiguration.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java b/action/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/AbstractServletDispatcherTestCase.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ChartResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/ChartResultTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/DefautActionMapperTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/DispatcherUtilsTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
new file mode 100644
index 000000000..e794e611e
--- /dev/null
+++ b/action/src/test/java/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
@@ -0,0 +1,183 @@
+/*
+ * $Id$
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.action2.dispatcher;
+
+import com.opensymphony.xwork.ObjectFactory;
+import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.config.Configuration;
+import org.apache.struts.action2.util.ObjectFactoryDestroyable;
+import org.apache.struts.action2.util.ObjectFactoryInitializable;
+import org.apache.struts.action2.util.ObjectFactoryLifecycle;
+import org.springframework.mock.web.MockFilterConfig;
+import org.springframework.mock.web.MockServletContext;
+
+import javax.servlet.ServletContext;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * FilterDispatcher TestCase.
+ *
+ * @author tm_jee
+ * @version $Date$ $Id$
+ */
+public class FilterDispatcherTest extends StrutsTestCase {
+
+
+    public void testParsePackages() throws Exception {
+        FilterDispatcher filterDispatcher = new FilterDispatcher();
+        String[] result1 = filterDispatcher.parse("foo.bar.package1 foo.bar.package2 foo.bar.package3");
+        String[] result2 = filterDispatcher.parse("foo.bar.package1\tfoo.bar.package2\tfoo.bar.package3");
+        String[] result3 = filterDispatcher.parse("foo.bar.package1,foo.bar.package2,foo.bar.package3");
+        String[] result4 = filterDispatcher.parse("foo.bar.package1    foo.bar.package2  \t foo.bar.package3   , foo.bar.package4");
+
+        assertEquals(result1[0], "foo/bar/package1/");
+        assertEquals(result1[1], "foo/bar/package2/");
+        assertEquals(result1[2], "foo/bar/package3/");
+
+        assertEquals(result2[0], "foo/bar/package1/");
+        assertEquals(result2[1], "foo/bar/package2/");
+        assertEquals(result2[2], "foo/bar/package3/");
+
+        assertEquals(result3[0], "foo/bar/package1/");
+        assertEquals(result3[1], "foo/bar/package2/");
+        assertEquals(result3[2], "foo/bar/package3/");
+
+        assertEquals(result4[0], "foo/bar/package1/");
+        assertEquals(result4[1], "foo/bar/package2/");
+        assertEquals(result4[2], "foo/bar/package3/");
+        assertEquals(result4[3], "foo/bar/package4/");
+    }
+
+    public void testObjectFactoryDestroy() throws Exception {
+        Configuration.reset();
+        DispatcherUtils.setInstance(null);
+
+        DispatcherUtils.initialize(new MockServletContext());
+
+        FilterDispatcher filterDispatcher = new FilterDispatcher();
+        InnerDestroyableObjectFactory destroyedObjectFactory = new InnerDestroyableObjectFactory();
+        ObjectFactory.setObjectFactory(destroyedObjectFactory);
+
+        assertFalse(destroyedObjectFactory.destroyed);
+        filterDispatcher.destroy();
+        assertTrue(destroyedObjectFactory.destroyed);
+    }
+
+
+    public void testObjectFactoryInitializable() throws Exception {
+        Configuration.reset();
+        DispatcherUtils.setInstance(null);
+
+        Map configMap = new HashMap();
+        configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
+        configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
+        Configuration.setConfiguration(new InnerConfiguration(configMap));
+
+        MockServletContext servletContext = new MockServletContext();
+        MockFilterConfig filterConfig = new MockFilterConfig(servletContext);
+
+
+        FilterDispatcher filterDispatcher = new FilterDispatcher();
+        filterDispatcher.init(filterConfig);
+
+        assertTrue(ObjectFactory.getObjectFactory() instanceof InnerInitializableObjectFactory);
+        assertTrue(((InnerInitializableObjectFactory) ObjectFactory.getObjectFactory()).initializable);
+    }
+
+    public void testObjectFactoryLifecycle() throws Exception {
+        Configuration.reset();
+        DispatcherUtils.setInstance(null);
+
+        Map configMap = new HashMap();
+        configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
+        configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
+        Configuration.setConfiguration(new InnerConfiguration(configMap));
+
+        MockServletContext servletContext = new MockServletContext();
+        MockFilterConfig filterConfig = new MockFilterConfig(servletContext);
+
+
+        FilterDispatcher filterDispatcher = new FilterDispatcher();
+        filterDispatcher.init(filterConfig);
+
+        assertTrue(ObjectFactory.getObjectFactory() instanceof InnerInitailizableDestroyableObjectFactory);
+        assertTrue(((InnerInitailizableDestroyableObjectFactory) ObjectFactory.getObjectFactory()).initializable);
+
+        assertFalse(((InnerInitailizableDestroyableObjectFactory) ObjectFactory.getObjectFactory()).destroyable);
+        filterDispatcher.destroy();
+        assertTrue(((InnerInitailizableDestroyableObjectFactory) ObjectFactory.getObjectFactory()).destroyable);
+    }
+
+
+    // === inner class ========
+    public static class InnerConfiguration extends Configuration {
+        Map m;
+
+        public InnerConfiguration(Map configMap) {
+            m = configMap;
+        }
+
+        public boolean isSetImpl(String name) {
+            if (!m.containsKey(name))
+                return super.isSetImpl(name);
+            else
+                return true;
+        }
+
+        public Object getImpl(String aName) throws IllegalArgumentException {
+            if (!m.containsKey(aName))
+                return super.getImpl(aName);
+            else
+                return m.get(aName);
+        }
+    }
+
+
+    public static class InnerDestroyableObjectFactory extends ObjectFactory implements ObjectFactoryDestroyable {
+        public boolean destroyed = false;
+
+        public void destroy() {
+            destroyed = true;
+        }
+    }
+
+    public static class InnerInitializableObjectFactory extends ObjectFactory implements ObjectFactoryInitializable {
+        public boolean initializable = false;
+
+        public void init(ServletContext servletContext) {
+            initializable = true;
+        }
+    }
+
+    public static class InnerInitailizableDestroyableObjectFactory extends ObjectFactory implements ObjectFactoryLifecycle {
+        public boolean initializable = false;
+        public boolean destroyable = false;
+
+        public void init(ServletContext servletContext) {
+            initializable = true;
+        }
+
+        public void destroy() {
+            destroyable = true;
+        }
+    }
+
+
+}
diff --git a/src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/HttpHeaderResultTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java b/action/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/NullActionMapper.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/NullActionMapper.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
similarity index 97%
rename from src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
index eaa554180..1023245fe 100644
--- a/src/test/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
+++ b/action/src/test/java/org/apache/struts/action2/dispatcher/PlainTextResultTest.java
@@ -57,7 +57,7 @@ public class PlainTextResultTest extends TestCase {
 		response.setExpectedHeader("Content-Disposition", "inline");
 		InputStream jspResourceInputStream = 
 			ClassLoaderUtil.getResourceAsStream(
-				"org/apache/struts/action2/dispatcher/someJspFile.jsp", 
+				"org/apache/struts/action2/dispatcher/someJspFile.jsp",
 				PlainTextResultTest.class);
 		
 		
@@ -84,7 +84,7 @@ public class PlainTextResultTest extends TestCase {
 		response.setExpectedHeader("Content-Disposition", "inline");
 		InputStream jspResourceInputStream = 
 			ClassLoaderUtil.getResourceAsStream(
-				"org/apache/struts/action2/dispatcher/someJspFile.jsp", 
+				"org/apache/struts/action2/dispatcher/someJspFile.jsp",
 				PlainTextResultTest.class);
 		
 		
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java b/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatchedTestAssertInterceptor.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherResultTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/ServletDispatcherTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/ServletRedirectResultTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/SessionMapTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/SessionMapTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/StreamResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/StreamResultTest.java
diff --git a/src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/VelocityResultTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/VelocityResultTest.java
diff --git a/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
new file mode 100644
index 000000000..d1593e6ed
--- /dev/null
+++ b/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
@@ -0,0 +1,264 @@
+/*
+ * $Id$
+ *
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.action2.dispatcher.mapper;
+
+import com.opensymphony.xwork.Result;
+import org.apache.struts.action2.StrutsTestCase;
+import org.apache.struts.action2.dispatcher.ServletRedirectResult;
+import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * DefaultActionMapper test case.
+ *
+ * @author tm_jee
+ * @version $Date$ $Id$
+ */
+public class DefaultActionMapperTest extends StrutsTestCase {
+
+    // =============================
+    // === test name & namespace ===
+    // =============================
+
+    public void testParseNameAndNamespace1() throws Exception {
+        ActionMapping actionMapping = new ActionMapping();
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        defaultActionMapper.parseNameAndNamespace("someAction.action", actionMapping);
+
+        assertEquals(actionMapping.getName(), "someAction");
+        assertEquals(actionMapping.getNamespace(), "");
+    }
+
+    public void testParseNameAndNamespace2() throws Exception {
+        ActionMapping actionMapping = new ActionMapping();
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        defaultActionMapper.parseNameAndNamespace("/someAction.action", actionMapping);
+
+        assertEquals(actionMapping.getName(), "someAction");
+        assertEquals(actionMapping.getNamespace(), "/");
+    }
+
+    public void testParseNameAndNamespace3() throws Exception {
+        ActionMapping actionMapping = new ActionMapping();
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        defaultActionMapper.parseNameAndNamespace("/one/two/three/someAction.action", actionMapping);
+
+        assertEquals(actionMapping.getName(), "someAction");
+        assertEquals(actionMapping.getNamespace(), "/one/two/three");
+    }
+
+
+    // ===========================
+    // === test special prefix ===
+    // ===========================
+    public void testMethodPrefix() throws Exception {
+        Map parameterMap = new HashMap();
+        parameterMap.put(DefaultActionMapper.METHOD_PREFIX + "myMethod", "");
+
+        StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
+        request.setParameterMap(parameterMap);
+        request.setupGetServletPath("/someServletPath.action");
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        ActionMapping actionMapping = defaultActionMapper.getMapping(request);
+
+        assertEquals(actionMapping.getMethod(), "myMethod");
+    }
+
+    public void testActionPrefix() throws Exception {
+        Map parameterMap = new HashMap();
+        parameterMap.put(DefaultActionMapper.ACTION_PREFIX + "myAction", "");
+
+        StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
+        request.setParameterMap(parameterMap);
+        request.setupGetServletPath("/someServletPath.action");
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        ActionMapping actionMapping = defaultActionMapper.getMapping(request);
+
+        assertEquals(actionMapping.getName(), "myAction");
+    }
+
+    public void testRedirectPrefix() throws Exception {
+        Map parameterMap = new HashMap();
+        parameterMap.put(DefaultActionMapper.REDIRECT_PREFIX + "www.google.com", "");
+
+        StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
+        request.setupGetServletPath("/someServletPath.action");
+        request.setParameterMap(parameterMap);
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        ActionMapping actionMapping = defaultActionMapper.getMapping(request);
+
+        Result result = actionMapping.getResult();
+        assertNotNull(result);
+        assertTrue(result instanceof ServletRedirectResult);
+
+        //TODO: need to test location but there's noaccess to the property/method, unless we use reflection
+    }
+
+    public void testRedirectActionPrefix() throws Exception {
+        Map parameterMap = new HashMap();
+        parameterMap.put(DefaultActionMapper.REDIRECT_ACTION_PREFIX + "myAction", "");
+
+        StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
+        request.setupGetServletPath("/someServletPath.action");
+        request.setParameterMap(parameterMap);
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        ActionMapping actionMapping = defaultActionMapper.getMapping(request);
+
+        Result result = actionMapping.getResult();
+        assertNotNull(result);
+        assertTrue(result instanceof ServletRedirectResult);
+
+        // TODO: need to test location but there's noaccess to the property/method, unless we use reflection
+    }
+
+
+    // ==========================
+    // === test action!method ===
+    // ==========================
+    public void testActionBangMethod() throws Exception {
+
+        StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
+        request.setupGetServletPath("/someName!someMethod.action");
+
+        DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        ActionMapping actionMapping = defaultActionMapper.getMapping(request);
+
+        assertEquals(actionMapping.getMethod(), "someMethod");
+        assertEquals(actionMapping.getName(), "someName");
+    }
+
+
+    public void testGetUriFromActionMapper1() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName");
+        actionMapping.setNamespace("/myNamespace");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myNamespace/myActionName!myMethod.action", uri);
+    }
+
+    public void testGetUriFromActionMapper2() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName");
+        actionMapping.setNamespace("/");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName!myMethod.action", uri);
+    }
+
+    public void testGetUriFromActionMapper3() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName");
+        actionMapping.setNamespace("");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName!myMethod.action", uri);
+    }
+
+
+    public void testGetUriFromActionMapper4() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setName("myActionName");
+        actionMapping.setNamespace("");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName.action", uri);
+    }
+
+    public void testGetUriFromActionMapper5() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setName("myActionName");
+        actionMapping.setNamespace("/");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName.action", uri);
+    }
+
+    //
+    public void testGetUriFromActionMapper6() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName?test=bla");
+        actionMapping.setNamespace("/myNamespace");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myNamespace/myActionName!myMethod.action?test=bla", uri);
+    }
+
+    public void testGetUriFromActionMapper7() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName?test=bla");
+        actionMapping.setNamespace("/");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName!myMethod.action?test=bla", uri);
+    }
+
+    public void testGetUriFromActionMapper8() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setMethod("myMethod");
+        actionMapping.setName("myActionName?test=bla");
+        actionMapping.setNamespace("");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName!myMethod.action?test=bla", uri);
+    }
+
+
+    public void testGetUriFromActionMapper9() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setName("myActionName?test=bla");
+        actionMapping.setNamespace("");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName.action?test=bla", uri);
+    }
+
+    public void testGetUriFromActionMapper10() throws Exception {
+        DefaultActionMapper mapper = new DefaultActionMapper();
+        ActionMapping actionMapping = new ActionMapping();
+        actionMapping.setName("myActionName?test=bla");
+        actionMapping.setNamespace("/");
+        String uri = mapper.getUriFromActionMapping(actionMapping);
+
+        assertEquals("/myActionName.action?test=bla", uri);
+    }
+
+}
diff --git a/src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java b/action/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
rename to action/src/test/java/org/apache/struts/action2/dispatcher/mapper/RestfulActionMapperTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/CreateSessionInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java b/action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitDelayAction.java
diff --git a/src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/ExecuteAndWaitInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
similarity index 97%
rename from src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
index f67e872dc..5d8fb9a6b 100644
--- a/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
+++ b/action/src/test/java/org/apache/struts/action2/interceptor/FileUploadInterceptorTest.java
@@ -46,6 +46,7 @@ import java.util.Map;
 public class FileUploadInterceptorTest extends StrutsTestCase {
 
     private FileUploadInterceptor interceptor;
+    private File tempDir;
 
     public void testAcceptFileWithEmptyAllowedTypes() throws Exception {
         // when allowed type is empty
@@ -221,15 +222,19 @@ public class FileUploadInterceptorTest extends StrutsTestCase {
     }
 
     private MultiPartRequestWrapper createMultipartRequest(HttpServletRequest req, int maxsize) throws IOException {
-       return new MultiPartRequestWrapper(req, "build" + File.separator + "test", maxsize);
+       return new MultiPartRequestWrapper(req, tempDir.getAbsolutePath(), maxsize);
     }
 
     protected void setUp() throws Exception {
         super.setUp();
         interceptor = new FileUploadInterceptor();
+        tempDir = File.createTempFile("struts", "fileupload");
+        tempDir.delete();
+        tempDir.mkdirs();
     }
 
     protected void tearDown() throws Exception {
+        tempDir.delete();
         interceptor.destroy();
         super.tearDown();
     }
diff --git a/src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/ServletConfigInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/StrutsConversionErrorInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/TokenInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java b/action/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
rename to action/src/test/java/org/apache/struts/action2/interceptor/TokenSessionStoreInterceptorTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java b/action/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/PortletApplicationMapTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java b/action/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/PortletRequestMapTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/PortletRequestMapTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java b/action/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/PortletSessionMapTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/PortletSessionMapTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java b/action/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/context/PortletActionContextTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java b/action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/context/PreparatorServletTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java b/action/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/context/ServletContextHolderListenerTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java b/action/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/dispatcher/Jsr168DispatcherTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java b/action/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/result/PortletResultTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/result/PortletResultTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java b/action/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/util/PortletUrlHelperTest.java
diff --git a/src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java b/action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
rename to action/src/test/java/org/apache/struts/action2/portlet/util/StrutsUtilTest.java
diff --git a/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java b/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
similarity index 72%
rename from src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
rename to action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
index 972deebc0..7bea8fad1 100644
--- a/src/test/org/apache/struts/action2/sitegraph/SiteGraphTest.java
+++ b/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
@@ -22,6 +22,7 @@ import org.apache.struts.action2.StrutsTestCase;
 
 import java.io.File;
 import java.io.StringWriter;
+import java.net.URL;
 
 /**
  * User: plightbo
@@ -30,13 +31,18 @@ import java.io.StringWriter;
  */
 public class SiteGraphTest extends StrutsTestCase {
     public void testWebFlow() {
-        String dir = "src/test/org/apache/struts/action2/sitegraph";
+        // use the classloader rather than relying on the
+        // working directory being an assumed value when
+        // running the test:  so let's get this class's parent dir 
+        URL url = this.getClass().getClassLoader().getResource(this.getClass().getName().replace(".", "/") + ".class");
+        File file = new File(url.toString().substring(5));
+        String dir = file.getParent();
         SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
         StringWriter writer = new StringWriter();
         siteGraph.setWriter(writer);
         siteGraph.prepare();
 
-        String out = "src/test/org/apache/struts/action2/sitegraph/out.txt";
+        String out = dir + "/out.txt";
         assertEquals(FileUtils.readFile(new File(out)), writer.toString());
     }
 }
diff --git a/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java b/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
similarity index 94%
rename from src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
rename to action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
index 5cb2e768e..210d0a4c9 100644
--- a/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
+++ b/action/src/test/java/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest.java
@@ -55,7 +55,7 @@ public class StrutsSpringObjectFactoryTest extends TestCase {
         ServletContext msc = (ServletContext) new MockServletContext();
         msc.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ac);
         ac.setServletContext(msc);
-        ac.setConfigLocations(new String[] {"/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
+        ac.setConfigLocations(new String[] {"org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml"});
         ac.refresh();
 
         fac.init(msc);
diff --git a/src/test/org/apache/struts/action2/util/CounterTest.java b/action/src/test/java/org/apache/struts/action2/util/CounterTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/util/CounterTest.java
rename to action/src/test/java/org/apache/struts/action2/util/CounterTest.java
diff --git a/src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java b/action/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/util/InvocationSessionStoreTest.java
rename to action/src/test/java/org/apache/struts/action2/util/InvocationSessionStoreTest.java
diff --git a/src/test/org/apache/struts/action2/util/PrefixTrieTest.java b/action/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/util/PrefixTrieTest.java
rename to action/src/test/java/org/apache/struts/action2/util/PrefixTrieTest.java
diff --git a/src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java b/action/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/util/StrutsTypeConverterTest.java
rename to action/src/test/java/org/apache/struts/action2/util/StrutsTypeConverterTest.java
diff --git a/src/test/org/apache/struts/action2/util/TokenHelperTest.java b/action/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/util/TokenHelperTest.java
rename to action/src/test/java/org/apache/struts/action2/util/TokenHelperTest.java
diff --git a/src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java b/action/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/TemplateEngineManagerTest.java
rename to action/src/test/java/org/apache/struts/action2/views/TemplateEngineManagerTest.java
diff --git a/src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java b/action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
rename to action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerManagerTest.java
diff --git a/src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java b/action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
rename to action/src/test/java/org/apache/struts/action2/views/freemarker/FreemarkerTest.java
diff --git a/src/test/org/apache/struts/action2/views/freemarker/TestAction.java b/action/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/freemarker/TestAction.java
rename to action/src/test/java/org/apache/struts/action2/views/freemarker/TestAction.java
diff --git a/src/test/org/apache/struts/action2/views/freemarker/TestBean.java b/action/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/freemarker/TestBean.java
rename to action/src/test/java/org/apache/struts/action2/views/freemarker/TestBean.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/AbstractTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/AbstractTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/AbstractUITagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/AbstractUITagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ActionTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ActionTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ActionTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/AnchorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/AnchorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/AppendIteratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/BeanTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/BeanTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/BeanTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ElseIfTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ElseTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ElseTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/IfTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/IfTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/IfTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/IncludeTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/IncludeTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/IncludeTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/IteratorGeneratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/IteratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/IteratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/IteratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/MergeIteratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/PortletUrlTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/PropertyTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/PropertyTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/PushTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/PushTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/PushTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/SetTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/SetTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/SetTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/SortIteratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockBodyContent.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletRequest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpServletResponse.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockHttpSession.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockJspWriter.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockPageContext.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java b/action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/StrutsMockServletContext.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/SubsetIteratorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/TextTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/TextTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/TextTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/URLTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/URLTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/URLTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/AbstractRichtexteditorTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionErrorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/ActionMessageTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/AnchorTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/AnchorTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxListTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/CheckboxTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComboBoxTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ComponentTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/ComponentTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DateTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/DateTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/DebugTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DivTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DivTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/DivTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/DoubleSelectTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/FieldErrorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/FileTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/FileTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/FileTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/FormTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/HeadTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HiddenTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/HiddenTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/JspTemplateTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/LabelTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/LabelTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/LabelTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/MockTag.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/MockTag.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/MockTag.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/OptionTransferSelectTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/PasswordTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/PasswordTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RadioTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RadioTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RadioTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ResetTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ResetTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/ResetTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichTextEditorTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/SelectTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/SelectTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/SelectTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/StrutsBodyContent.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitAjaxTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/SubmitTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/SubmitTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TestAction1.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TestAction1.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/TestAction1.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TextareaTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextareaTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/TextfieldTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/TokenTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/TooltipTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/UpDownSelectTagTest.java
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/User.java b/action/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/User.java
rename to action/src/test/java/org/apache/struts/action2/views/jsp/ui/User.java
diff --git a/src/test/org/apache/struts/action2/views/util/ContextUtilTest.java b/action/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/util/ContextUtilTest.java
rename to action/src/test/java/org/apache/struts/action2/views/util/ContextUtilTest.java
diff --git a/src/test/org/apache/struts/action2/views/util/ResourceUtilTest.java b/action/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/util/ResourceUtilTest.java
rename to action/src/test/java/org/apache/struts/action2/views/util/ResourceUtilTest.java
diff --git a/src/test/org/apache/struts/action2/views/util/TextUtilTest.java b/action/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/util/TextUtilTest.java
rename to action/src/test/java/org/apache/struts/action2/views/util/TextUtilTest.java
diff --git a/src/test/org/apache/struts/action2/views/util/UrlHelperTest.java b/action/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/util/UrlHelperTest.java
rename to action/src/test/java/org/apache/struts/action2/views/util/UrlHelperTest.java
diff --git a/src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java b/action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
similarity index 100%
rename from src/test/org/apache/struts/action2/views/xslt/XSLTResultTest.java
rename to action/src/test/java/org/apache/struts/action2/views/xslt/XSLTResultTest.java
diff --git a/src/test/XSLTResultTest.xsl b/action/src/test/resources/XSLTResultTest.xsl
similarity index 100%
rename from src/test/XSLTResultTest.xsl
rename to action/src/test/resources/XSLTResultTest.xsl
diff --git a/src/test/XSLTResultTest2.xsl b/action/src/test/resources/XSLTResultTest2.xsl
similarity index 100%
rename from src/test/XSLTResultTest2.xsl
rename to action/src/test/resources/XSLTResultTest2.xsl
diff --git a/src/test/XSLTResultTest3.xsl b/action/src/test/resources/XSLTResultTest3.xsl
similarity index 100%
rename from src/test/XSLTResultTest3.xsl
rename to action/src/test/resources/XSLTResultTest3.xsl
diff --git a/src/test/log4j.properties b/action/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/log4j.properties
rename to action/src/test/resources/log4j.properties
diff --git a/src/test/org/apache/struts/action2/TestAction-validation.xml b/action/src/test/resources/org/apache/struts/action2/TestAction-validation.xml
similarity index 100%
rename from src/test/org/apache/struts/action2/TestAction-validation.xml
rename to action/src/test/resources/org/apache/struts/action2/TestAction-validation.xml
diff --git a/src/test/org/apache/struts/action2/TestAction.properties b/action/src/test/resources/org/apache/struts/action2/TestAction.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/TestAction.properties
rename to action/src/test/resources/org/apache/struts/action2/TestAction.properties
diff --git a/src/test/org/apache/struts/action2/components/tempo.properties b/action/src/test/resources/org/apache/struts/action2/components/tempo.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/components/tempo.properties
rename to action/src/test/resources/org/apache/struts/action2/components/tempo.properties
diff --git a/src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml b/action/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
rename to action/src/test/resources/org/apache/struts/action2/dispatcher/ServletDispatcherTest-xwork.xml
diff --git a/src/test/org/apache/struts/action2/dispatcher/someJspFile.jsp b/action/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp
similarity index 100%
rename from src/test/org/apache/struts/action2/dispatcher/someJspFile.jsp
rename to action/src/test/resources/org/apache/struts/action2/dispatcher/someJspFile.jsp
diff --git a/src/test/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties b/action/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
rename to action/src/test/resources/org/apache/struts/action2/interceptor/FileUploadInterceptor.properties
diff --git a/src/test/org/apache/struts/action2/othertest.properties b/action/src/test/resources/org/apache/struts/action2/othertest.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/othertest.properties
rename to action/src/test/resources/org/apache/struts/action2/othertest.properties
diff --git a/src/test/org/apache/struts/action2/sitegraph/hello.jsp b/action/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/hello.jsp
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/hello.jsp
diff --git a/src/test/org/apache/struts/action2/sitegraph/out.txt b/action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/out.txt
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/out.txt
diff --git a/src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl b/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-error.ftl
diff --git a/src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl b/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-input.ftl
diff --git a/src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp b/action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/tutorial/sitegraph/guess-success.jsp
diff --git a/src/test/org/apache/struts/action2/sitegraph/xwork.xml b/action/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml
similarity index 100%
rename from src/test/org/apache/struts/action2/sitegraph/xwork.xml
rename to action/src/test/resources/org/apache/struts/action2/sitegraph/xwork.xml
diff --git a/src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml b/action/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
similarity index 100%
rename from src/test/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
rename to action/src/test/resources/org/apache/struts/action2/spring/StrutsSpringObjectFactoryTest-applicationContext.xml
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Checkbox-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/CheckboxList-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/ComboBox-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Component-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Component-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Component-param.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Component-param.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Component-param.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DatePickerTagTest-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/DoubleSelect-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/File-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/File-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/File-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-6.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-7.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Formtag-8.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/HeadTagTest-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Hidden-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Label-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Label-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Label-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Label-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Label-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Label-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Label-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Password-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Password-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Password-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Radio-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Radio-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Radio-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Reset-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Reset-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Reset-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Reset-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Reset-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorCreateFolderResultTest1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorFileUploadResultTest3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersAndFilesResultTest1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/RichtexteditorGetFoldersResultTest1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Select-6.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Select-6.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Select-6.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Submit-6.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Submit-6.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TestAction1.properties b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1.properties
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_de.properties
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/TestAction1_fr.properties
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textarea-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/Textfield-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/User-validation.xml b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/User-validation.xml
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User-validation.xml
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/User.properties b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/User.properties
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/User.properties
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionerror-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/actionmessage-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/div-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/div-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/div-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/fielderror-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/href-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/href-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/href-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-6.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/optiontransferselect-7.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/richtexteditor-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/submit-ajax-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/tooltip-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-1.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-10.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-11.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-2.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-3.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-4.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-5.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-6.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-7.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-8.txt
diff --git a/src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt b/action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
similarity index 100%
rename from src/test/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
rename to action/src/test/resources/org/apache/struts/action2/views/jsp/ui/updownselecttag-9.txt
diff --git a/src/test/struts.properties b/action/src/test/resources/struts.properties
similarity index 100%
rename from src/test/struts.properties
rename to action/src/test/resources/struts.properties
diff --git a/src/test/template/test/Component.ftl b/action/src/test/resources/template/test/Component.ftl
similarity index 100%
rename from src/test/template/test/Component.ftl
rename to action/src/test/resources/template/test/Component.ftl
diff --git a/src/test/template/test/checkbox.jsp b/action/src/test/resources/template/test/checkbox.jsp
similarity index 100%
rename from src/test/template/test/checkbox.jsp
rename to action/src/test/resources/template/test/checkbox.jsp
diff --git a/src/test/test.properties b/action/src/test/resources/test.properties
similarity index 100%
rename from src/test/test.properties
rename to action/src/test/resources/test.properties
diff --git a/src/test/testmessages.properties b/action/src/test/resources/testmessages.properties
similarity index 100%
rename from src/test/testmessages.properties
rename to action/src/test/resources/testmessages.properties
diff --git a/src/test/testmessages2.properties b/action/src/test/resources/testmessages2.properties
similarity index 100%
rename from src/test/testmessages2.properties
rename to action/src/test/resources/testmessages2.properties
diff --git a/src/test/validators.xml b/action/src/test/resources/validators.xml
similarity index 100%
rename from src/test/validators.xml
rename to action/src/test/resources/validators.xml
diff --git a/pom.xml b/pom.xml
index dc84284e5..d1a3a4daf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts.action2</groupId>
-    <artifactId>struts-action</artifactId>
     <version>2.0-SNAPSHOT</version>
-    <name>Struts Action Framework 2.0</name>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+    <name>Struts Action Framework 2.0 Project</name>
     <description>
         WebWork is a Java web-application development framework.
         It is built specifically with developer productivity and
@@ -14,6 +15,16 @@
         internationalization, dynamic form parameter mapping to JavaBeans,
         robust client and server side validation, and much more.
     </description>
+    <licenses>
+        <license>
+            <name>The OpenSymphony Software License 1.1</name>
+            <url>http://opensymphony.com/webwork/license.action</url>
+            <comments>
+                This license is derived and fully compatible with the Apache Software
+                License - see http://www.apache.org/LICENSE.txt
+            </comments>
+        </license>
+    </licenses>
     <url>http://www.opensymphony.com/webwork/</url>
     <organization>
         <name>OpenSymphony</name>
@@ -52,457 +63,13 @@
             </otherArchives>
         </mailingList>
     </mailingLists>
+    <modules>
+        <module>action</module>
+        <module>webapps</module>
+    </modules>
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</connection>
         <developerConnection>scm:svn:http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</developerConnection>
         <url>http://svn.apache.org/repos/asf/incubator/webwork2/trunk/</url>
     </scm>
-    <licenses>
-        <license>
-            <name>The OpenSymphony Software License 1.1</name>
-            <url>http://opensymphony.com/webwork/license.action</url>
-            <comments>
-                This license is derived and fully compatible with the Apache Software
-                License - see http://www.apache.org/LICENSE.txt
-            </comments>
-        </license>
-    </licenses>
-    <profiles>
-        <profile>
-            <activation>
-                <jdk>1.4</jdk>
-            </activation>
-            <dependencies>
-                <!-- should have the org.w3c.dom dependency here -->
-            </dependencies>
-        </profile>
-    </profiles>
-    <repositories>
-        <repository>
-            <id>opensymphony</id>
-            <name>opensymphony</name>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <url>http://maven.opensymphony.com</url>
-        </repository>
-        <repository>
-            <id>apache</id>
-            <name>apache</name>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <url>http://cvs.apache.org/repository</url>
-        </repository>
-    </repositories>
-    <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>src/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/*.html</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                    <exclude>**/*.html</exclude>
-                </excludes>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.5</jdkName>
-                    <exclude>target,dist,docs/wikidocs,test-output,.clover</exclude>
-                    <useShortDependencyNames>true</useShortDependencyNames>
-                    <libraries>
-                        <library>
-                            <name>xwork</name>
-                            <sources>file://$xwork$/src/java</sources>
-                        </library>
-                        <library>
-                            <name>xwork-tiger</name>
-                            <sources>file://$xwork$/tiger/src/java</sources>
-                        </library>
-                    </libraries>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                  <source>1.4</source>
-                  <target>1.4</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                    <excludes>
-                        <exclude>**/TestBean.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <!-- unreferenced dependencies:
-             * clover, mockobjects, xdoclet : only needed for build
-             * cewolf : only used in demos
-             * quickstart : because i'm lazy, and because it's unlikely to be needed to build a
-                            project using ww
-             * w3c.dom : needed for the xslt : this is all included in jdk1.5
-                         - classes missing in jdk1.4 are org.w3c.dom.TypeInfo,
-                           org.w3c.dom.UserDataHandler, org.w3c.dom.DOMConfiguration
-                         - this should be configurable with <profiles>
-         -->
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>xwork</artifactId>
-            <version>1.2-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>xwork-tiger</artifactId>
-            <version>1.2-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Ajax -->
-        <dependency>
-            <groupId>dwr</groupId>
-            <artifactId>dwr</artifactId>
-            <version>1.1-beta-3</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Velocity -->
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.4</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>velocity-tools</groupId>
-            <artifactId>velocity-tools</artifactId>
-            <version>1.1</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- File upload -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.1</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>servlets.com</groupId>
-            <artifactId>cos</artifactId>
-            <version>05Nov2002</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>pell-multipart</artifactId>
-            <!-- webwork's ivy dependency reports mentions v1.19 ? -->
-            <version>2.1.5</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Sitemesh -->
-        <dependency>
-            <!-- group should be com.opensymphony -->
-            <groupId>opensymphony</groupId>
-            <artifactId>sitemesh</artifactId>
-            <version>2.2.1</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Quickstart -->
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>5.1.4</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>eclipse</groupId>
-            <artifactId>jdtcore</artifactId>
-            <version>3.1.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Jasper -->
-        <dependency>
-            <groupId>jasperreports</groupId>
-            <artifactId>jasperreports</artifactId>
-            <version>1.1.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- JFree -->
-        <dependency>
-            <groupId>jfree</groupId>
-            <artifactId>jfreechart</artifactId>
-            <version>1.0.0</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>gnujaxp</groupId>
-                    <artifactId>gnujaxp</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Tiles -->
-        <dependency>
-            <groupId>org.apache.struts.tiles</groupId>
-            <artifactId>tiles-core</artifactId>
-            <version>0.2-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.7</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Portlet -->
-        <dependency>
-            <groupId>portlet-api</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto</artifactId>
-            <version>1.0.1-rc4</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Plexus -->
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-            <version>1.0-alpha-10-SNAPSHOT</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Pico -->
-        <dependency>
-            <groupId>picocontainer</groupId>
-            <artifactId>picocontainer</artifactId>
-            <version>1.2</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>picocontainer</groupId>
-            <artifactId>picocontainer-gems</artifactId>
-            <version>1.2</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>nanocontainer</groupId>
-            <artifactId>nanocontainer</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>nanocontainer</groupId>
-            <artifactId>nanocontainer-nanowar</artifactId>
-            <version>1.0</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>1.2.6</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>1.2.6</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>1.2.6</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>1.2.6</version>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-            <version>1.2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- nanocontainer override -->
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
-            <version>1.1.3.4-RC8</version>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>compile</scope>
-            <!-- has to be compile for WebWorkTestCase, which is part of the base package so others can write unit tests -->
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock</artifactId>
-            <version>1.0.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>1.2_Java1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <version>1.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock-cglib</artifactId>
-            <version>1.0.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-core</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-jdk1.3</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-alt-jdk1.3</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-alt-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>mockobjects</groupId>
-            <artifactId>mockobjects-jdk1.3-j2ee1.3</artifactId>
-            <version>0.09</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
 </project>
diff --git a/src/main/idea/workspace.xml b/src/main/idea/workspace.xml
new file mode 100644
index 000000000..4642c3413
--- /dev/null
+++ b/src/main/idea/workspace.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4" relativePaths="false">
+  <component name="RunManager">
+    <activeType name="JUnit" />
+    <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="wholeProject" />
+      </option>
+    </configuration>
+    <configuration selected="false" default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration selected="false" default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <module name="" />
+    </configuration>
+    <configuration selected="false" default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+    </configuration>
+    <configuration selected="true" default="false" name="All Tests" type="JUnit" factoryName="JUnit">
+      <module name="action" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.apache.struts.action2" />
+      <option name="MAIN_CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="VM_PARAMETERS" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ADDITIONAL_CLASS_PATH" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+    </configuration>
+  </component>
+</project>
+
diff --git a/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java b/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
deleted file mode 100644
index 30d0f2062..000000000
--- a/src/test/org/apache/struts/action2/dispatcher/FilterDispatcherTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.action2.dispatcher;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.springframework.mock.web.MockFilterConfig;
-import org.springframework.mock.web.MockServletContext;
-
-import org.apache.struts.action2.StrutsConstants;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.util.ObjectFactoryDestroyable;
-import org.apache.struts.action2.util.ObjectFactoryInitializable;
-import org.apache.struts.action2.util.ObjectFactoryLifecycle;
-import com.opensymphony.xwork.ObjectFactory;
-
-import junit.framework.TestCase;
-
-/**
- * FilterDispatcher TestCase.
- *
- * @author tm_jee 
- * @version $Date$ $Id$
- */
-public class FilterDispatcherTest extends TestCase {
-
-
-	public void testParsePackages() throws Exception {
-		FilterDispatcher filterDispatcher = new FilterDispatcher();
-		String[] result1 = filterDispatcher.parse("foo.bar.package1 foo.bar.package2 foo.bar.package3");
-		String[] result2 = filterDispatcher.parse("foo.bar.package1\tfoo.bar.package2\tfoo.bar.package3");
-		String[] result3 = filterDispatcher.parse("foo.bar.package1,foo.bar.package2,foo.bar.package3");
-		String[] result4 = filterDispatcher.parse("foo.bar.package1    foo.bar.package2  \t foo.bar.package3   , foo.bar.package4");
-
-		assertEquals(result1[0], "foo/bar/package1/");
-		assertEquals(result1[1], "foo/bar/package2/");
-		assertEquals(result1[2], "foo/bar/package3/");
-
-		assertEquals(result2[0], "foo/bar/package1/");
-		assertEquals(result2[1], "foo/bar/package2/");
-		assertEquals(result2[2], "foo/bar/package3/");
-
-		assertEquals(result3[0], "foo/bar/package1/");
-		assertEquals(result3[1], "foo/bar/package2/");
-		assertEquals(result3[2], "foo/bar/package3/");
-
-		assertEquals(result4[0], "foo/bar/package1/");
-		assertEquals(result4[1], "foo/bar/package2/");
-		assertEquals(result4[2], "foo/bar/package3/");
-		assertEquals(result4[3], "foo/bar/package4/");
-	}
-	
-	public void testObjectFactoryDestroy() throws Exception {
-		Configuration.reset();
-		DispatcherUtils.setInstance(null);
-		
-		DispatcherUtils.initialize(new MockServletContext());
-		
-		FilterDispatcher filterDispatcher = new FilterDispatcher();
-		InnerDestroyableObjectFactory destroyedObjectFactory = new InnerDestroyableObjectFactory();
-		ObjectFactory.setObjectFactory(destroyedObjectFactory);
-		
-		assertFalse(destroyedObjectFactory.destroyed);
-		filterDispatcher.destroy();
-		assertTrue(destroyedObjectFactory.destroyed);
-	}
-	
-	
-	public void testObjectFactoryInitializable() throws Exception {
-		Configuration.reset();
-		DispatcherUtils.setInstance(null);
-		
-		Map configMap = new HashMap();
-		configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitializableObjectFactory");
-		configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
-		Configuration.setConfiguration(new InnerConfiguration(configMap));
-		
-		MockServletContext servletContext = new MockServletContext();
-		MockFilterConfig filterConfig = new MockFilterConfig(servletContext);
-	
-		
-		FilterDispatcher filterDispatcher = new FilterDispatcher();
-		filterDispatcher.init(filterConfig);
-		
-		assertTrue(ObjectFactory.getObjectFactory() instanceof InnerInitializableObjectFactory);
-		assertTrue(((InnerInitializableObjectFactory)ObjectFactory.getObjectFactory()).initializable);
-	}
-	
-	public void testObjectFactoryLifecycle() throws Exception {
-		Configuration.reset();
-		DispatcherUtils.setInstance(null);
-		
-		Map configMap = new HashMap();
-		configMap.put(StrutsConstants.STRUTS_OBJECTFACTORY, "org.apache.struts.action2.dispatcher.FilterDispatcherTest$InnerInitailizableDestroyableObjectFactory");
-		configMap.put(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "false");
-		Configuration.setConfiguration(new InnerConfiguration(configMap));
-		
-		MockServletContext servletContext = new MockServletContext();
-		MockFilterConfig filterConfig = new MockFilterConfig(servletContext);
-	
-		
-		FilterDispatcher filterDispatcher = new FilterDispatcher();
-		filterDispatcher.init(filterConfig);
-		
-		assertTrue(ObjectFactory.getObjectFactory() instanceof InnerInitailizableDestroyableObjectFactory);
-		assertTrue(((InnerInitailizableDestroyableObjectFactory)ObjectFactory.getObjectFactory()).initializable);
-		
-		assertFalse(((InnerInitailizableDestroyableObjectFactory)ObjectFactory.getObjectFactory()).destroyable);
-		filterDispatcher.destroy();
-		assertTrue(((InnerInitailizableDestroyableObjectFactory)ObjectFactory.getObjectFactory()).destroyable);
-	}
-	
-	
-	// === inner class ========
-	public static class InnerConfiguration extends Configuration {
-		Map m;
-		public InnerConfiguration(Map configMap) {
-			m = configMap;
-		}
-		
-		public boolean isSetImpl(String name) {
-			if (!m.containsKey(name)) 
-				return super.isSetImpl(name);
-			else 
-				return true;
-		}
-		
-		public Object getImpl(String aName) throws IllegalArgumentException {
-			if (!m.containsKey(aName))
-				return super.getImpl(aName);
-			else 
-				return m.get(aName);
-		}
-	}
-	
-	
-	public static class InnerDestroyableObjectFactory extends ObjectFactory implements ObjectFactoryDestroyable {
-		public boolean destroyed = false;
-		
-		public void destroy() {
-			destroyed = true;
-		}
-	}
-	
-	public static class InnerInitializableObjectFactory extends ObjectFactory implements ObjectFactoryInitializable {
-		public boolean initializable = false;
-		public void init(ServletContext servletContext) {
-			initializable = true;
-		}
-	}
-	
-	public static class InnerInitailizableDestroyableObjectFactory extends ObjectFactory implements ObjectFactoryLifecycle {
-		public boolean initializable = false;
-		public boolean destroyable = false;
-		
-		public void init(ServletContext servletContext) {
-			initializable = true;
-		}
-
-		public void destroy() {
-			destroyable = true;
-		}
-	}
-	
-	
-}
diff --git a/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java b/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
deleted file mode 100644
index 177b1b0b8..000000000
--- a/src/test/org/apache/struts/action2/dispatcher/mapper/DefaultActionMapperTest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * $Id$
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.action2.dispatcher.mapper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.struts.action2.dispatcher.ServletRedirectResult;
-import org.apache.struts.action2.views.jsp.StrutsMockHttpServletRequest;
-import com.opensymphony.xwork.Result;
-
-import junit.framework.TestCase;
-
-/**
- * DefaultActionMapper test case.
- * 
- * @author tm_jee
- * @version $Date$ $Id$
- */
-public class DefaultActionMapperTest extends TestCase {
-
-	// =============================
-	// === test name & namespace ===
-	// =============================
-	
-	public void testParseNameAndNamespace1() throws Exception {
-		ActionMapping actionMapping = new ActionMapping();
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		defaultActionMapper.parseNameAndNamespace("someAction.action", actionMapping);
-		
-		assertEquals(actionMapping.getName(), "someAction");
-		assertEquals(actionMapping.getNamespace(), "");
-	}
-	
-	public void testParseNameAndNamespace2() throws Exception {
-		ActionMapping actionMapping = new ActionMapping();
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		defaultActionMapper.parseNameAndNamespace("/someAction.action", actionMapping);
-		
-		assertEquals(actionMapping.getName(), "someAction");
-		assertEquals(actionMapping.getNamespace(), "/");
-	}
-	
-	public void testParseNameAndNamespace3() throws Exception {
-		ActionMapping actionMapping = new ActionMapping();
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		defaultActionMapper.parseNameAndNamespace("/one/two/three/someAction.action", actionMapping);
-
-		assertEquals(actionMapping.getName(), "someAction");
-		assertEquals(actionMapping.getNamespace(), "/one/two/three");
-	}
-	
-	
-	// ===========================
-	// === test special prefix ===
-	// ===========================
-	public void testMethodPrefix() throws Exception {
-		Map parameterMap = new HashMap();
-		parameterMap.put(DefaultActionMapper.METHOD_PREFIX+"myMethod", "");
-		
-		StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
-		request.setParameterMap(parameterMap);
-		request.setupGetServletPath("/someServletPath.action");
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		ActionMapping actionMapping = defaultActionMapper.getMapping(request);
-		
-		assertEquals(actionMapping.getMethod(), "myMethod");
-	}
-	
-	public void testActionPrefix() throws Exception {
-		Map parameterMap = new HashMap();
-		parameterMap.put(DefaultActionMapper.ACTION_PREFIX+"myAction", "");
-		
-		StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
-		request.setParameterMap(parameterMap);
-		request.setupGetServletPath("/someServletPath.action");
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		ActionMapping actionMapping = defaultActionMapper.getMapping(request);
-		
-		assertEquals(actionMapping.getName(), "myAction");
-	}
-	
-	public void testRedirectPrefix() throws Exception {
-		Map parameterMap = new HashMap();
-		parameterMap.put(DefaultActionMapper.REDIRECT_PREFIX+"www.google.com", "");
-		
-		StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
-		request.setupGetServletPath("/someServletPath.action");
-		request.setParameterMap(parameterMap);
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		ActionMapping actionMapping = defaultActionMapper.getMapping(request);
-		
-		Result result = actionMapping.getResult();
-		assertNotNull(result);
-		assertTrue(result instanceof ServletRedirectResult);
-		
-		//TODO: need to test location but there's noaccess to the property/method, unless we use reflection
-	}
-	
-	public void testRedirectActionPrefix() throws Exception {
-		Map parameterMap = new HashMap();
-		parameterMap.put(DefaultActionMapper.REDIRECT_ACTION_PREFIX+"myAction", "");
-		
-		StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
-		request.setupGetServletPath("/someServletPath.action");
-		request.setParameterMap(parameterMap);
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		ActionMapping actionMapping = defaultActionMapper.getMapping(request);
-		
-		Result result = actionMapping.getResult();
-		assertNotNull(result);
-		assertTrue(result instanceof ServletRedirectResult);
-		
-		// TODO: need to test location but there's noaccess to the property/method, unless we use reflection
-	}
-	
-	
-	
-	// ==========================
-	// === test action!method ===
-	// ==========================
-	public void testActionBangMethod() throws Exception {
-		
-		StrutsMockHttpServletRequest request = new StrutsMockHttpServletRequest();
-		request.setupGetServletPath("/someName!someMethod.action");
-		
-		DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
-		ActionMapping actionMapping = defaultActionMapper.getMapping(request);
-		
-		assertEquals(actionMapping.getMethod(), "someMethod");
-		assertEquals(actionMapping.getName(), "someName");
-	}
-	
-	
-	public void testGetUriFromActionMapper1() throws Exception {
-		DefaultActionMapper mapper = new DefaultActionMapper();
-		ActionMapping actionMapping = new ActionMapping();
-		actionMapping.setMethod("myMethod");
-		actionMapping.setName("myActionName");
-		actionMapping.setNamespace("/myNamespace");
-		String uri = mapper.getUriFromActionMapping(actionMapping);
-		
-		assertEquals("/myNamespace/myActionName!myMethod.action", uri);
-	}
-	
-	public void testGetUriFromActionMapper2() throws Exception {
-		DefaultActionMapper mapper = new DefaultActionMapper();
-		ActionMapping actionMapping = new ActionMapping();
-		actionMapping.setMethod("myMethod");
-		actionMapping.setName("myActionName");
-		actionMapping.setNamespace("/");
-		String uri = mapper.getUriFromActionMapping(actionMapping);
-		
-		assertEquals("/myActionName!myMethod.action", uri);
-	}
-	
-	public void testGetUriFromActionMapper3() throws Exception {
-		DefaultActionMapper mapper = new DefaultActionMapper();
-		ActionMapping actionMapping = new ActionMapping();
-		actionMapping.setMethod("myMethod");
-		actionMapping.setName("myActionName");
-		actionMapping.setNamespace("");
-		String uri = mapper.getUriFromActionMapping(actionMapping);
-		
-		assertEquals("/myActionName!myMethod.action", uri);
-	}
-	
-	
-	public void testGetUriFromActionMapper4() throws Exception {
-		DefaultActionMapper mapper = new DefaultActionMapper();
-		ActionMapping actionMapping = new ActionMapping();
-		actionMapping.setName("myActionName");
-		actionMapping.setNamespace("");
-		String uri = mapper.getUriFromActionMapping(actionMapping);
-		
-		assertEquals("/myActionName.action", uri);
-	}
-	
-	public void testGetUriFromActionMapper5() throws Exception {
-		DefaultActionMapper mapper = new DefaultActionMapper();
-		ActionMapping actionMapping = new ActionMapping();
-		actionMapping.setName("myActionName");
-		actionMapping.setNamespace("/");
-		String uri = mapper.getUriFromActionMapping(actionMapping);
-		
-		assertEquals("/myActionName.action", uri);
-	}
-
-    //
-    public void testGetUriFromActionMapper6() throws Exception {
-        DefaultActionMapper mapper = new DefaultActionMapper();
-        ActionMapping actionMapping = new ActionMapping();
-        actionMapping.setMethod("myMethod");
-        actionMapping.setName("myActionName?test=bla");
-        actionMapping.setNamespace("/myNamespace");
-        String uri = mapper.getUriFromActionMapping(actionMapping);
-
-        assertEquals("/myNamespace/myActionName!myMethod.action?test=bla", uri);
-    }
-
-    public void testGetUriFromActionMapper7() throws Exception {
-        DefaultActionMapper mapper = new DefaultActionMapper();
-        ActionMapping actionMapping = new ActionMapping();
-        actionMapping.setMethod("myMethod");
-        actionMapping.setName("myActionName?test=bla");
-        actionMapping.setNamespace("/");
-        String uri = mapper.getUriFromActionMapping(actionMapping);
-
-        assertEquals("/myActionName!myMethod.action?test=bla", uri);
-    }
-
-    public void testGetUriFromActionMapper8() throws Exception {
-        DefaultActionMapper mapper = new DefaultActionMapper();
-        ActionMapping actionMapping = new ActionMapping();
-        actionMapping.setMethod("myMethod");
-        actionMapping.setName("myActionName?test=bla");
-        actionMapping.setNamespace("");
-        String uri = mapper.getUriFromActionMapping(actionMapping);
-
-        assertEquals("/myActionName!myMethod.action?test=bla", uri);
-    }
-
-
-    public void testGetUriFromActionMapper9() throws Exception {
-        DefaultActionMapper mapper = new DefaultActionMapper();
-        ActionMapping actionMapping = new ActionMapping();
-        actionMapping.setName("myActionName?test=bla");
-        actionMapping.setNamespace("");
-        String uri = mapper.getUriFromActionMapping(actionMapping);
-
-        assertEquals("/myActionName.action?test=bla", uri);
-    }
-
-    public void testGetUriFromActionMapper10() throws Exception {
-        DefaultActionMapper mapper = new DefaultActionMapper();
-        ActionMapping actionMapping = new ActionMapping();
-        actionMapping.setName("myActionName?test=bla");
-        actionMapping.setNamespace("/");
-        String uri = mapper.getUriFromActionMapping(actionMapping);
-
-        assertEquals("/myActionName.action?test=bla", uri);
-    }
-
-}
diff --git a/webapps/blank/.classpath b/webapps/blank/.classpath
deleted file mode 100644
index 14942a930..000000000
--- a/webapps/blank/.classpath
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="src/test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry sourcepath="@WEBWORK_HOME@/webwork-@WEBWORK_VERSION@.jar" kind="lib" path="@WEBWORK_HOME@/webwork-@WEBWORK_VERSION@.jar"/>
-	<classpathentry sourcepath="@WEBWORK_HOME@/lib/source/xwork-src.jar" kind="lib" path="@WEBWORK_HOME@/lib/default/xwork.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/commons-logging.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/freemarker.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/javamail.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/ognl.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/oscore.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/default/rife-continuations.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/quickstart/log4j.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/spring-web.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/cglib-nodep.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/commons-attributes-api.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/commons-logging.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/spring-aop.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/spring-beans.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/spring-context.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/spring/spring-core.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/portlet/portlet-api.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/fileupload/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/cewolf/cewolf.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/ajax/dwr.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/tiles/tiles-core.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/tiles/commons-digester.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/sitemesh/sitemesh.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/velocity/velocity-tools-view.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/velocity/commons-collections.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/velocity/velocity.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/velocity/velocity-dep.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/xslt/jcommon.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/xslt/dom.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/hibernate.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/antlr.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/asm.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/cglib.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/commons-collections.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/commons-logging.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/dom4j.jar"/>
-	<classpathentry kind="lib" path="@WEBWORK_HOME@/lib/hibernate/ehcache.jar"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
diff --git a/webapps/blank/.project b/webapps/blank/.project
deleted file mode 100644
index 6f35c7753..000000000
--- a/webapps/blank/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>@PROJECT_NAME@</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/webapps/blank/blank.iml b/webapps/blank/blank.iml
deleted file mode 100644
index 59233975c..000000000
--- a/webapps/blank/blank.iml
+++ /dev/null
@@ -1,505 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/java" />
-    <exclude-output />
-    <exclude-exploded />
-    <output-test url="file://$MODULE_DIR$/build/test" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="WebWork" />
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-  <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://" />
-    <setting name="EXPLODED_ENABLED" value="false" />
-    <setting name="JAR_URL" value="file://" />
-    <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
-    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
-    <setting name="RUN_JASPER_VALIDATION" value="false" />
-  </component>
-  <component name="WebModuleProperties">
-    <containerElement type="module" name="WebWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="module" name="XWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/ajax/dwr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover-license.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/bootstrap/clover-license.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-cli.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/bootstrap/commons-cli.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-httpclient.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/bootstrap/commons-httpclient.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/bootstrap/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ivy-1.1.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/bootstrap/ivy-1.1.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet-web-module.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xjavadoc.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xjavadoc.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/xwork.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/multipartrequest.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-pell/multipartrequest.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload/commons-fileupload.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/freemarker/freemarker.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/antlr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/antlr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ehcache.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/ehcache.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hibernate.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/hibernate.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-beanutils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-digester.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-digester.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/itext.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/itext.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasperreports.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/jasperreports.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jfreechart.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jfreechart.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer-nanowar.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer-nanowar.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer-gems.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer-gems.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-el.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-io.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-io.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-lang.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-lang.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm-attrs.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/asm-attrs.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../../xwork/lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" version="2.3" />
-    <webroots>
-      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
-    </webroots>
-  </component>
-  <component name="WeblogicWebModuleProperties">
-    <option name="IS_RUN_APPC" value="false" />
-  </component>
-</module>
-
diff --git a/webapps/blank/pom.xml b/webapps/blank/pom.xml
new file mode 100644
index 000000000..67efda685
--- /dev/null
+++ b/webapps/blank/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>webapps</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapp-blank</artifactId>
+    <packaging>war</packaging>
+    <name>Blank Webapp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/webapps/blank/src/java/org/apache/struts/action2/example/HomeAction.java b/webapps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java
similarity index 100%
rename from webapps/blank/src/java/org/apache/struts/action2/example/HomeAction.java
rename to webapps/blank/src/main/java/org/apache/struts/action2/example/HomeAction.java
diff --git a/webapps/blank/src/webapp/WEB-INF/applicationContext.xml b/webapps/blank/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/blank/src/webapp/WEB-INF/applicationContext.xml
rename to webapps/blank/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/blank/src/webapp/WEB-INF/classes/webwork.properties b/webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties
similarity index 100%
rename from webapps/blank/src/webapp/WEB-INF/classes/webwork.properties
rename to webapps/blank/src/main/webapp/WEB-INF/classes/webwork.properties
diff --git a/webapps/blank/src/webapp/WEB-INF/classes/xwork.xml b/webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/blank/src/webapp/WEB-INF/classes/xwork.xml
rename to webapps/blank/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/blank/src/webapp/WEB-INF/pages/home.jsp b/webapps/blank/src/main/webapp/WEB-INF/pages/home.jsp
similarity index 100%
rename from webapps/blank/src/webapp/WEB-INF/pages/home.jsp
rename to webapps/blank/src/main/webapp/WEB-INF/pages/home.jsp
diff --git a/webapps/blank/src/webapp/WEB-INF/web.xml b/webapps/blank/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/blank/src/webapp/WEB-INF/web.xml
rename to webapps/blank/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/blank/src/webapp/index.jsp b/webapps/blank/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/blank/src/webapp/index.jsp
rename to webapps/blank/src/main/webapp/index.jsp
diff --git a/webapps/blank/src/test/org/apache/struts/action2/example/HomeActionTest.java b/webapps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java
similarity index 100%
rename from webapps/blank/src/test/org/apache/struts/action2/example/HomeActionTest.java
rename to webapps/blank/src/test/java/org/apache/struts/action2/example/HomeActionTest.java
diff --git a/webapps/pom.xml b/webapps/pom.xml
new file mode 100644
index 000000000..4b6077e67
--- /dev/null
+++ b/webapps/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts.action2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapps</artifactId>
+    <packaging>pom</packaging>
+    <name>Webapps</name>
+    <modules>
+        <module>blank</module>
+        <module>portlet</module>
+        <module>shopping-cart</module>
+        <module>showcase</module>
+        <module>starter</module>
+    </modules>
+</project>
diff --git a/webapps/portlet/Portlet.iml b/webapps/portlet/Portlet.iml
deleted file mode 100644
index a6f3e98d0..000000000
--- a/webapps/portlet/Portlet.iml
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/java" />
-    <exclude-output />
-    <exclude-exploded />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="WebWork" />
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-  <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://" />
-    <setting name="EXPLODED_ENABLED" value="false" />
-    <setting name="JAR_URL" value="file://" />
-    <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
-    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
-    <setting name="RUN_JASPER_VALIDATION" value="false" />
-  </component>
-  <component name="WebModuleProperties">
-    <containerElement type="module" name="WebWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="module" name="XWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/ajax/dwr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock-cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock-cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet-web-module.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xjavadoc.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xjavadoc.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/multipartrequest.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-pell/multipartrequest.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload/commons-fileupload.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/freemarker/freemarker.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/antlr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/antlr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ehcache.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/ehcache.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hibernate.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/hibernate.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-beanutils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-digester.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-digester.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/itext.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/itext.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasperreports.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/jasperreports.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/poi.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/poi.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jfreechart.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jfreechart.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer-nanowar.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer-nanowar.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer-gems.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer-gems.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/classworlds.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/classworlds.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-container-default.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-container-default.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-utils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-utils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-el.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-io.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-io.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-lang.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-lang.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xstream.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/xstream.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork-src.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/source/xwork-src.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$xwork$/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$xwork$/lib/build/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$xwork$/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$xwork$/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$xwork$/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$xwork$/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$xwork$/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$xwork$/lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$xwork$/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$xwork$/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$xwork$/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$xwork$/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$xwork$/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$xwork$/lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
-    <webroots>
-      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
-    </webroots>
-  </component>
-  <component name="WeblogicWebModuleProperties">
-    <option name="IS_RUN_APPC" value="false" />
-  </component>
-  <component name="com.fuhrer.idea.plugin.jboss.JBossWebModule" />
-</module>
-
diff --git a/webapps/portlet/pom.xml b/webapps/portlet/pom.xml
new file mode 100644
index 000000000..edde6afac
--- /dev/null
+++ b/webapps/portlet/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>webapps</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapp-portlet</artifactId>
+    <packaging>war</packaging>
+    <name>Portet Webapp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>portlet-api</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cewolf</groupId>
+            <artifactId>cewolf</artifactId>
+            <version>1.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>gnujaxp</groupId>
+                    <artifactId>gnujaxp</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/webapps/portlet/src/etc/exo/web.xml b/webapps/portlet/src/main/etc/exo/web.xml
similarity index 100%
rename from webapps/portlet/src/etc/exo/web.xml
rename to webapps/portlet/src/main/etc/exo/web.xml
diff --git a/webapps/portlet/src/etc/gridsphere/README-gridsphere.txt b/webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/README-gridsphere.txt
rename to webapps/portlet/src/main/etc/gridsphere/README-gridsphere.txt
diff --git a/webapps/portlet/src/etc/gridsphere/gridsphere-portlet.xml b/webapps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/gridsphere-portlet.xml
rename to webapps/portlet/src/main/etc/gridsphere/gridsphere-portlet.xml
diff --git a/webapps/portlet/src/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar b/webapps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
rename to webapps/portlet/src/main/etc/gridsphere/gridsphere-ui-tags-2.1.2.jar
diff --git a/webapps/portlet/src/etc/gridsphere/group.xml b/webapps/portlet/src/main/etc/gridsphere/group.xml
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/group.xml
rename to webapps/portlet/src/main/etc/gridsphere/group.xml
diff --git a/webapps/portlet/src/etc/gridsphere/layout.xml b/webapps/portlet/src/main/etc/gridsphere/layout.xml
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/layout.xml
rename to webapps/portlet/src/main/etc/gridsphere/layout.xml
diff --git a/webapps/portlet/src/etc/gridsphere/web.xml b/webapps/portlet/src/main/etc/gridsphere/web.xml
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/web.xml
rename to webapps/portlet/src/main/etc/gridsphere/web.xml
diff --git a/webapps/portlet/src/etc/gridsphere/webwork-portlet b/webapps/portlet/src/main/etc/gridsphere/webwork-portlet
similarity index 100%
rename from webapps/portlet/src/etc/gridsphere/webwork-portlet
rename to webapps/portlet/src/main/etc/gridsphere/webwork-portlet
diff --git a/webapps/portlet/src/etc/jbossportal2.0/jboss-app.xml b/webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.0/jboss-app.xml
rename to webapps/portlet/src/main/etc/jbossportal2.0/jboss-app.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.0/jboss-portlet.xml b/webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.0/jboss-portlet.xml
rename to webapps/portlet/src/main/etc/jbossportal2.0/jboss-portlet.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.0/jboss-web.xml b/webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.0/jboss-web.xml
rename to webapps/portlet/src/main/etc/jbossportal2.0/jboss-web.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.0/portlet-instances.xml b/webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.0/portlet-instances.xml
rename to webapps/portlet/src/main/etc/jbossportal2.0/portlet-instances.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.0/webwork-portlet-pages.xml b/webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.0/webwork-portlet-pages.xml
rename to webapps/portlet/src/main/etc/jbossportal2.0/webwork-portlet-pages.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.2/jboss-app.xml b/webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.2/jboss-app.xml
rename to webapps/portlet/src/main/etc/jbossportal2.2/jboss-app.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.2/jboss-portlet.xml b/webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.2/jboss-portlet.xml
rename to webapps/portlet/src/main/etc/jbossportal2.2/jboss-portlet.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.2/jboss-web.xml b/webapps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.2/jboss-web.xml
rename to webapps/portlet/src/main/etc/jbossportal2.2/jboss-web.xml
diff --git a/webapps/portlet/src/etc/jbossportal2.2/webwork-portlet-object.xml b/webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml
similarity index 100%
rename from webapps/portlet/src/etc/jbossportal2.2/webwork-portlet-object.xml
rename to webapps/portlet/src/main/etc/jbossportal2.2/webwork-portlet-object.xml
diff --git a/webapps/portlet/src/etc/jetspeed2/README-jetspeed2.txt b/webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
similarity index 100%
rename from webapps/portlet/src/etc/jetspeed2/README-jetspeed2.txt
rename to webapps/portlet/src/main/etc/jetspeed2/README-jetspeed2.txt
diff --git a/webapps/portlet/src/etc/jetspeed2/webwork-portlet.psml b/webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml
similarity index 100%
rename from webapps/portlet/src/etc/jetspeed2/webwork-portlet.psml
rename to webapps/portlet/src/main/etc/jetspeed2/webwork-portlet.psml
diff --git a/webapps/portlet/src/etc/liferay3.6.1/web.xml b/webapps/portlet/src/main/etc/liferay3.6.1/web.xml
similarity index 100%
rename from webapps/portlet/src/etc/liferay3.6.1/web.xml
rename to webapps/portlet/src/main/etc/liferay3.6.1/web.xml
diff --git a/webapps/portlet/src/java/commons-logging.properties b/webapps/portlet/src/main/java/commons-logging.properties
similarity index 100%
rename from webapps/portlet/src/java/commons-logging.properties
rename to webapps/portlet/src/main/java/commons-logging.properties
diff --git a/webapps/portlet/src/java/log4j.xml b/webapps/portlet/src/main/java/log4j.xml
similarity index 100%
rename from webapps/portlet/src/java/log4j.xml
rename to webapps/portlet/src/main/java/log4j.xml
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ChartExampleAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/ExampleAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/ExampleAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/ExampleAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample-processValidationExample-validation.xml
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExample.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExample.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExample.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormExampleWithValidation.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormResultAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormResultAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormResultAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormTestAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/FormTestAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/FormTestAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/SavePrefsAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/SpringAction.java
diff --git a/webapps/portlet/src/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java b/webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
similarity index 100%
rename from webapps/portlet/src/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
rename to webapps/portlet/src/main/java/org/apache/struts/action2/portlet/example/spring/ThingManager.java
diff --git a/webapps/portlet/src/java/template/xhtml/components/checkbox.vm b/webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
similarity index 100%
rename from webapps/portlet/src/java/template/xhtml/components/checkbox.vm
rename to webapps/portlet/src/main/java/template/xhtml/components/checkbox.vm
diff --git a/webapps/portlet/src/java/template/xhtml/components/datefield.vm b/webapps/portlet/src/main/java/template/xhtml/components/datefield.vm
similarity index 100%
rename from webapps/portlet/src/java/template/xhtml/components/datefield.vm
rename to webapps/portlet/src/main/java/template/xhtml/components/datefield.vm
diff --git a/webapps/portlet/src/java/template/xhtml/components/mytextfield.vm b/webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
similarity index 100%
rename from webapps/portlet/src/java/template/xhtml/components/mytextfield.vm
rename to webapps/portlet/src/main/java/template/xhtml/components/mytextfield.vm
diff --git a/webapps/portlet/src/java/validators.xml b/webapps/portlet/src/main/java/validators.xml
similarity index 100%
rename from webapps/portlet/src/java/validators.xml
rename to webapps/portlet/src/main/java/validators.xml
diff --git a/webapps/portlet/src/java/webwork.properties b/webapps/portlet/src/main/java/webwork.properties
similarity index 100%
rename from webapps/portlet/src/java/webwork.properties
rename to webapps/portlet/src/main/java/webwork.properties
diff --git a/webapps/portlet/src/java/xwork.xml b/webapps/portlet/src/main/java/xwork.xml
similarity index 100%
rename from webapps/portlet/src/java/xwork.xml
rename to webapps/portlet/src/main/java/xwork.xml
diff --git a/webapps/portlet/src/webapp/WEB-INF/applicationContext.xml b/webapps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/applicationContext.xml
rename to webapps/portlet/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/portlet/src/webapp/WEB-INF/dwr.xml b/webapps/portlet/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/dwr.xml
rename to webapps/portlet/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/defaultEdit.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/defaultEdit.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/defaultEdit.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/formExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/formExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/formExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/formExampleInput.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/formExampleInput.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/formExampleInput.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/index.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/index.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/index.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/index.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/namespaceTest.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/namespaceTest.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/namespaceTest.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/prefsForm.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/prefsForm.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/prefsForm.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/prefsSaved.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/prefsSaved.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/prefsSaved.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/edit/test.jsp b/webapps/portlet/src/main/webapp/WEB-INF/edit/test.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/edit/test.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/edit/test.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/help/defaultHelp.jsp b/webapps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/help/defaultHelp.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/help/defaultHelp.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/help/index.jsp b/webapps/portlet/src/main/webapp/WEB-INF/help/index.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/help/index.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/help/index.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/lib/batik-awt-util.jar b/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/lib/batik-awt-util.jar
rename to webapps/portlet/src/main/webapp/WEB-INF/lib/batik-awt-util.jar
diff --git a/webapps/portlet/src/webapp/WEB-INF/lib/batik-svggen.jar b/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/lib/batik-svggen.jar
rename to webapps/portlet/src/main/webapp/WEB-INF/lib/batik-svggen.jar
diff --git a/webapps/portlet/src/webapp/WEB-INF/lib/batik-util.jar b/webapps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/lib/batik-util.jar
rename to webapps/portlet/src/main/webapp/WEB-INF/lib/batik-util.jar
diff --git a/webapps/portlet/src/webapp/WEB-INF/lib/cewolf.jar b/webapps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/lib/cewolf.jar
rename to webapps/portlet/src/main/webapp/WEB-INF/lib/cewolf.jar
diff --git a/webapps/portlet/src/webapp/WEB-INF/portlet.xml b/webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/portlet.xml
rename to webapps/portlet/src/main/webapp/WEB-INF/portlet.xml
diff --git a/webapps/portlet/src/webapp/WEB-INF/readme.txt b/webapps/portlet/src/main/webapp/WEB-INF/readme.txt
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/readme.txt
rename to webapps/portlet/src/main/webapp/WEB-INF/readme.txt
diff --git a/webapps/portlet/src/webapp/WEB-INF/tld/cewolf.tld b/webapps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/tld/cewolf.tld
rename to webapps/portlet/src/main/webapp/WEB-INF/tld/cewolf.tld
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/ajax.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/ajax.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/ajax.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/ajaxData.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/ajaxData.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/ajaxData.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/ajaxExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/ajaxExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/ajaxExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/chartExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/chartExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/chartExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/formExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/formExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/formExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/formExampleInput.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/formExampleInput.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInput.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/formExampleInputValidation.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/formExampleInputValidation.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/formExampleInputValidation.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/freeMarkerExample.ftl b/webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/freeMarkerExample.ftl
rename to webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/freeMarkerExampleInput.ftl b/webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
rename to webapps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExampleInput.ftl
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/helloWorld.vm b/webapps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/helloWorld.vm
rename to webapps/portlet/src/main/webapp/WEB-INF/view/helloWorld.vm
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/index.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/index.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/index.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/index.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/notImplemented.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/notImplemented.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/notImplemented.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/springExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/springExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/springExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/tokenExample.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/tokenExample.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/tokenExample.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/view/tokenExampleInput.jsp b/webapps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/view/tokenExampleInput.jsp
rename to webapps/portlet/src/main/webapp/WEB-INF/view/tokenExampleInput.jsp
diff --git a/webapps/portlet/src/webapp/WEB-INF/web.xml b/webapps/portlet/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/portlet/src/webapp/WEB-INF/web.xml
rename to webapps/portlet/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/portlet/src/webapp/styles/styles.css b/webapps/portlet/src/main/webapp/styles/styles.css
similarity index 100%
rename from webapps/portlet/src/webapp/styles/styles.css
rename to webapps/portlet/src/main/webapp/styles/styles.css
diff --git a/webapps/shopping-cart/ShoppingCart.iml b/webapps/shopping-cart/ShoppingCart.iml
deleted file mode 100644
index f07bf139f..000000000
--- a/webapps/shopping-cart/ShoppingCart.iml
+++ /dev/null
@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/java" />
-    <exclude-output />
-    <exploded url="file://$MODULE_DIR$/build/exploded" />
-    <exclude-exploded />
-    <output-test url="file://$MODULE_DIR$/build/test" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Generic" level="application_server_libraries" />
-    <orderEntry type="module" module-name="WebWork" />
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-  <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/build/exploded" />
-    <setting name="EXPLODED_ENABLED" value="false" />
-    <setting name="JAR_URL" value="file://" />
-    <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
-    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
-    <setting name="RUN_JASPER_VALIDATION" value="false" />
-  </component>
-  <component name="WebModuleProperties">
-    <containerElement type="module" name="WebWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="module" name="XWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/ajax/dwr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock-cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock-cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet-web-module.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xjavadoc.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xjavadoc.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/multipartrequest.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-pell/multipartrequest.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload/commons-fileupload.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/freemarker/freemarker.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/antlr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/antlr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ehcache.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/ehcache.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hibernate.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/hibernate.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-beanutils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-digester.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-digester.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/itext.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/itext.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasperreports.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/jasperreports.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/poi.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/poi.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jfreechart.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jfreechart.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer-nanowar.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer-nanowar.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer-gems.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer-gems.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/classworlds.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/classworlds.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-container-default.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-container-default.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-utils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-utils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-el.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-io.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-io.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-lang.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-lang.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xstream.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/xstream.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork-src.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/source/xwork-src.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$xwork$/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$xwork$/lib/build/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$xwork$/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$xwork$/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$xwork$/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$xwork$/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$xwork$/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$xwork$/lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$xwork$/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$xwork$/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$xwork$/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$xwork$/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$xwork$/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$xwork$/lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
-    <webroots>
-      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
-    </webroots>
-  </component>
-  <component name="WeblogicWebModuleProperties">
-    <option name="IS_RUN_APPC" value="false" />
-  </component>
-  <component name="com.fuhrer.idea.plugin.jboss.JBossWebModule" />
-</module>
-
diff --git a/webapps/shopping-cart/pom.xml b/webapps/shopping-cart/pom.xml
new file mode 100644
index 000000000..de1a4872a
--- /dev/null
+++ b/webapps/shopping-cart/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>webapps</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapp-shopping-cart</artifactId>
+    <packaging>war</packaging>
+    <name>Shopping Cart Webapp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction-validation.xml
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/AbstractModifyCartAction.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ActiveCategory.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/SetActiveCategory.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCart.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/ShowCatalog.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/actions/UpdateQuantityInCart.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/DefaultCart.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/cart/ShoppingCart.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Catalog.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Category.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Category.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Category.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Identifiable.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Product.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/Product.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/Product.java
diff --git a/webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java b/webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
similarity index 100%
rename from webapps/shopping-cart/src/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
rename to webapps/shopping-cart/src/main/java/org/apache/struts/action2/example/ajax/catalog/TestCatalog.java
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/applicationContext.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/default.properties b/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/classes/default.properties
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/classes/default.properties
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/log4j.properties b/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/classes/log4j.properties
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/classes/log4j.properties
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/validators.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/classes/validators.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/classes/validators.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/webwork.properties b/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/classes/webwork.properties
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/classes/webwork.properties
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/classes/xwork.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/decorators.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/decorators.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/decorators.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/decorators/main.jsp b/webapps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/decorators/main.jsp
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/dwr.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/lib/sitemesh-2.2.1.jar b/webapps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/lib/sitemesh-2.2.1.jar
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/sitemesh-decorator.tld b/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/sitemesh-decorator.tld
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-decorator.tld
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/sitemesh-page.tld b/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/sitemesh-page.tld
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh-page.tld
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/sitemesh.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/sitemesh.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/sitemesh.xml
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/velocity.properties b/webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/velocity.properties
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
diff --git a/webapps/shopping-cart/src/webapp/WEB-INF/web.xml b/webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/shopping-cart/src/webapp/WEB-INF/web.xml
rename to webapps/shopping-cart/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/shopping-cart/src/webapp/cart.jsp b/webapps/shopping-cart/src/main/webapp/cart.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/cart.jsp
rename to webapps/shopping-cart/src/main/webapp/cart.jsp
diff --git a/webapps/shopping-cart/src/webapp/category-main.jsp b/webapps/shopping-cart/src/main/webapp/category-main.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/category-main.jsp
rename to webapps/shopping-cart/src/main/webapp/category-main.jsp
diff --git a/webapps/shopping-cart/src/webapp/category.jsp b/webapps/shopping-cart/src/main/webapp/category.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/category.jsp
rename to webapps/shopping-cart/src/main/webapp/category.jsp
diff --git a/webapps/shopping-cart/src/webapp/categorySet.jsp b/webapps/shopping-cart/src/main/webapp/categorySet.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/categorySet.jsp
rename to webapps/shopping-cart/src/main/webapp/categorySet.jsp
diff --git a/webapps/shopping-cart/src/webapp/css/cart.css b/webapps/shopping-cart/src/main/webapp/css/cart.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/cart.css
rename to webapps/shopping-cart/src/main/webapp/css/cart.css
diff --git a/webapps/shopping-cart/src/webapp/css/dtree.css b/webapps/shopping-cart/src/main/webapp/css/dtree.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/dtree.css
rename to webapps/shopping-cart/src/main/webapp/css/dtree.css
diff --git a/webapps/shopping-cart/src/webapp/css/forms.css b/webapps/shopping-cart/src/main/webapp/css/forms.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/forms.css
rename to webapps/shopping-cart/src/main/webapp/css/forms.css
diff --git a/webapps/shopping-cart/src/webapp/css/layout-navtop-1col.css b/webapps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/layout-navtop-1col.css
rename to webapps/shopping-cart/src/main/webapp/css/layout-navtop-1col.css
diff --git a/webapps/shopping-cart/src/webapp/css/layout-navtop-localleft.css b/webapps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/layout-navtop-localleft.css
rename to webapps/shopping-cart/src/main/webapp/css/layout-navtop-localleft.css
diff --git a/webapps/shopping-cart/src/webapp/css/layout.css b/webapps/shopping-cart/src/main/webapp/css/layout.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/layout.css
rename to webapps/shopping-cart/src/main/webapp/css/layout.css
diff --git a/webapps/shopping-cart/src/webapp/css/main.css b/webapps/shopping-cart/src/main/webapp/css/main.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/main.css
rename to webapps/shopping-cart/src/main/webapp/css/main.css
diff --git a/webapps/shopping-cart/src/webapp/css/nav-horizontal.css b/webapps/shopping-cart/src/main/webapp/css/nav-horizontal.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/nav-horizontal.css
rename to webapps/shopping-cart/src/main/webapp/css/nav-horizontal.css
diff --git a/webapps/shopping-cart/src/webapp/css/niftyCorners.css b/webapps/shopping-cart/src/main/webapp/css/niftyCorners.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/niftyCorners.css
rename to webapps/shopping-cart/src/main/webapp/css/niftyCorners.css
diff --git a/webapps/shopping-cart/src/webapp/css/niftyPrint.css b/webapps/shopping-cart/src/main/webapp/css/niftyPrint.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/niftyPrint.css
rename to webapps/shopping-cart/src/main/webapp/css/niftyPrint.css
diff --git a/webapps/shopping-cart/src/webapp/css/niftylayout.css b/webapps/shopping-cart/src/main/webapp/css/niftylayout.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/niftylayout.css
rename to webapps/shopping-cart/src/main/webapp/css/niftylayout.css
diff --git a/webapps/shopping-cart/src/webapp/css/tools.css b/webapps/shopping-cart/src/main/webapp/css/tools.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/tools.css
rename to webapps/shopping-cart/src/main/webapp/css/tools.css
diff --git a/webapps/shopping-cart/src/webapp/css/typo.css b/webapps/shopping-cart/src/main/webapp/css/typo.css
similarity index 100%
rename from webapps/shopping-cart/src/webapp/css/typo.css
rename to webapps/shopping-cart/src/main/webapp/css/typo.css
diff --git a/webapps/shopping-cart/src/webapp/images/Thumbs.db b/webapps/shopping-cart/src/main/webapp/images/Thumbs.db
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/Thumbs.db
rename to webapps/shopping-cart/src/main/webapp/images/Thumbs.db
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/base.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/base.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/base.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/base.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/cd.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/cd.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/cd.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/cd.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/empty.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/empty.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/empty.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/empty.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/folder.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/folder.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/folder.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/folder.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/folderopen.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/folderopen.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/folderopen.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/globe.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/globe.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/globe.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/globe.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/imgfolder.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/imgfolder.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/imgfolder.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/join.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/join.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/join.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/join.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/joinbottom.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/joinbottom.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/joinbottom.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/line.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/line.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/line.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/line.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/minus.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/minus.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/minus.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/minus.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/minusbottom.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/minusbottom.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/minusbottom.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/musicfolder.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/musicfolder.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/musicfolder.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/nolines_minus.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/nolines_minus.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/nolines_minus.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/nolines_plus.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/nolines_plus.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/nolines_plus.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/page.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/page.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/page.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/page.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/plus.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/plus.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/plus.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/plus.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/plusbottom.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/plusbottom.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/plusbottom.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/question.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/question.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/question.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/question.gif
diff --git a/webapps/shopping-cart/src/webapp/images/dtree/trash.gif b/webapps/shopping-cart/src/main/webapp/images/dtree/trash.gif
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/dtree/trash.gif
rename to webapps/shopping-cart/src/main/webapp/images/dtree/trash.gif
diff --git a/webapps/shopping-cart/src/webapp/images/logo-small.png b/webapps/shopping-cart/src/main/webapp/images/logo-small.png
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/logo-small.png
rename to webapps/shopping-cart/src/main/webapp/images/logo-small.png
diff --git a/webapps/shopping-cart/src/webapp/images/logo.png b/webapps/shopping-cart/src/main/webapp/images/logo.png
similarity index 100%
rename from webapps/shopping-cart/src/webapp/images/logo.png
rename to webapps/shopping-cart/src/main/webapp/images/logo.png
diff --git a/webapps/shopping-cart/src/webapp/index.jsp b/webapps/shopping-cart/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/shopping-cart/src/webapp/index.jsp
rename to webapps/shopping-cart/src/main/webapp/index.jsp
diff --git a/webapps/shopping-cart/src/webapp/js/dtree.js b/webapps/shopping-cart/src/main/webapp/js/dtree.js
similarity index 100%
rename from webapps/shopping-cart/src/webapp/js/dtree.js
rename to webapps/shopping-cart/src/main/webapp/js/dtree.js
diff --git a/webapps/shopping-cart/src/webapp/js/nifty.js b/webapps/shopping-cart/src/main/webapp/js/nifty.js
similarity index 100%
rename from webapps/shopping-cart/src/webapp/js/nifty.js
rename to webapps/shopping-cart/src/main/webapp/js/nifty.js
diff --git a/webapps/showcase/Showcase.iml b/webapps/showcase/Showcase.iml
deleted file mode 100644
index d3fc0f97f..000000000
--- a/webapps/showcase/Showcase.iml
+++ /dev/null
@@ -1,515 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/java" />
-    <exclude-output />
-    <exploded url="file://$MODULE_DIR$/exploded" />
-    <exclude-exploded />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="WebWork" />
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-  <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://$MODULE_DIR$/exploded" />
-    <setting name="EXPLODED_ENABLED" value="false" />
-    <setting name="JAR_URL" value="file://" />
-    <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
-    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
-    <setting name="RUN_JASPER_VALIDATION" value="false" />
-  </component>
-  <component name="WebModuleProperties">
-    <containerElement type="module" name="WebWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="module" name="XWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/ajax/dwr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock-cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock-cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet-web-module.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xjavadoc.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xjavadoc.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/multipartrequest.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-pell/multipartrequest.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload/commons-fileupload.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/antlr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/antlr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ehcache.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/ehcache.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hibernate.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/hibernate.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-beanutils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-digester.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-digester.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/itext.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/itext.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasperreports.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/jasperreports.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/poi.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/poi.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jfreechart.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jfreechart.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer-nanowar.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer-nanowar.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer-gems.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer-gems.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/classworlds.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/classworlds.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-container-default.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-container-default.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-utils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-utils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-el.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-io.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-io.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-lang.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-lang.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xstream.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/xstream.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork-src.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/source/xwork-src.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$xwork$/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$xwork$/lib/build/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$xwork$/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$xwork$/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$xwork$/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$xwork$/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$xwork$/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$xwork$/lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$xwork$/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$xwork$/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$xwork$/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$xwork$/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$xwork$/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$xwork$/lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
-    <webroots>
-      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
-    </webroots>
-  </component>
-  <component name="WeblogicWebModuleProperties">
-    <option name="IS_RUN_APPC" value="false" />
-  </component>
-  <component name="com.fuhrer.idea.plugin.jboss.JBossWebModule" />
-  <component name="org.mevenide.idea.module.ModuleSettings">
-    <favoriteGoals>
-      <list size="0" />
-    </favoriteGoals>
-  </component>
-</module>
-
diff --git a/webapps/showcase/pom.xml b/webapps/showcase/pom.xml
new file mode 100644
index 000000000..6b670e80e
--- /dev/null
+++ b/webapps/showcase/pom.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>webapps</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapp-showcase</artifactId>
+    <packaging>war</packaging>
+    <name>Showcase Webapp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>1.2.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jasperreports</groupId>
+            <artifactId>jasperreports</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/DateAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/DateAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/DateAction.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/DateAction.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/DateAction.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/Guess.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/Guess.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/Guess.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfOptiontransferselectAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample-conversion.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/UITagExample.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/UITagExample.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/UITagExample.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/AbstractCRUDAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/action/SkillAction_de.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain1.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain2.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/actionchaining/ActionChain3.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/ajax/AjaxTestAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/application/MemoryStorage.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/MemoryStorage.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/application/Storage.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/application/Storage.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/Storage.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/application/TestDataProvider.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/application/TestDataProvider.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/AbstractDao.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/AbstractDao.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/Dao.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/Dao.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/Dao.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/EmployeeDao.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/SkillDao.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/dao/SkillDao.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/dao/SkillDao.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/CreateException.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/CreateException.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/CreateException.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/DeleteException.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/DeleteException.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DeleteException.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/DuplicateKeyException.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/StorageException.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/StorageException.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/StorageException.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/UpdateException.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/exception/UpdateException.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/exception/UpdateException.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/filedownload/FileDownloadAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/fileupload/FileUploadAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/jasper/JasperAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/jasper/JasperAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/model/Employee.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/model/Employee.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Employee.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/model/IdEntity.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/model/IdEntity.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/IdEntity.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/model/Skill.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/model/Skill.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/model/Skill.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/Gangster.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/modelDriven/ModelDrivenAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/CreatePerson.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/CreatePerson.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/CreatePerson.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/EditPerson.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/EditPerson.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/EditPerson.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/ListPeople.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/ListPeople.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/ListPeople.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/Person-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/Person-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/Person.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/Person.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/Person.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/person/PersonManager.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/person/PersonManager.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/person/PersonManager.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/actiontag/ActionTagDemo.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/MergeIteratorTagDemo.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/tag/nonui/iteratortag/SubsetIteratorTagDemo.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/token/TokenAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/token/TokenAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/token/TokenAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/AbstractValidationActionSupport.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/QuizAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/QuizAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/QuizAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/User.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/User.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/User.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction.java
diff --git a/webapps/showcase/src/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java b/webapps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
similarity index 100%
rename from webapps/showcase/src/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
rename to webapps/showcase/src/main/java/org/apache/struts/action2/showcase/wait/LongProcessAction.java
diff --git a/webapps/showcase/src/webapp/WEB-INF/applicationContext.xml b/webapps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/applicationContext.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/globalMessages.properties b/webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/globalMessages.properties
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages.properties
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/globalMessages_de.properties b/webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/globalMessages_de.properties
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/globalMessages_de.properties
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties b/webapps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/log4j.properties
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/log4j.properties
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties b/webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/webwork.properties
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/webwork.properties
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-actionchaining.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-actionchaining.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-ajax.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-ajax.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-continuations.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-continuations.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-filedownload.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-filedownload.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-fileupload.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-fileupload.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-model-driven.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-model-driven.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-person.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-person.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-non-ui.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags-ui.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags-ui.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-tags.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-tags.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-token.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-token.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-validation.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-validation.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork-wait.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork-wait.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml b/webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/classes/xwork.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/decorators.xml b/webapps/showcase/src/main/webapp/WEB-INF/decorators.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/decorators.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/decorators.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp b/webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/decorators/main.jsp
rename to webapps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
diff --git a/webapps/showcase/src/webapp/WEB-INF/dwr.xml b/webapps/showcase/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/dwr.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/dwr.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/sitemesh-decorator.tld b/webapps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/sitemesh-decorator.tld
rename to webapps/showcase/src/main/webapp/WEB-INF/sitemesh-decorator.tld
diff --git a/webapps/showcase/src/webapp/WEB-INF/sitemesh-page.tld b/webapps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/sitemesh-page.tld
rename to webapps/showcase/src/main/webapp/WEB-INF/sitemesh-page.tld
diff --git a/webapps/showcase/src/webapp/WEB-INF/sitemesh.xml b/webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/sitemesh.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/sitemesh.xml
diff --git a/webapps/showcase/src/webapp/WEB-INF/web.xml b/webapps/showcase/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/showcase/src/webapp/WEB-INF/web.xml
rename to webapps/showcase/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/showcase/src/webapp/actionchaining/actionChainingResult.jsp b/webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/actionchaining/actionChainingResult.jsp
rename to webapps/showcase/src/main/webapp/actionchaining/actionChainingResult.jsp
diff --git a/webapps/showcase/src/webapp/ajax/AjaxResult.jsp b/webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/AjaxResult.jsp
rename to webapps/showcase/src/main/webapp/ajax/AjaxResult.jsp
diff --git a/webapps/showcase/src/webapp/ajax/AjaxResult2.js b/webapps/showcase/src/main/webapp/ajax/AjaxResult2.js
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/AjaxResult2.js
rename to webapps/showcase/src/main/webapp/ajax/AjaxResult2.js
diff --git a/webapps/showcase/src/webapp/ajax/AjaxResult3.jsp b/webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/AjaxResult3.jsp
rename to webapps/showcase/src/main/webapp/ajax/AjaxResult3.jsp
diff --git a/webapps/showcase/src/webapp/ajax/commonInclude.jsp b/webapps/showcase/src/main/webapp/ajax/commonInclude.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/commonInclude.jsp
rename to webapps/showcase/src/main/webapp/ajax/commonInclude.jsp
diff --git a/webapps/showcase/src/webapp/ajax/footer.jsp b/webapps/showcase/src/main/webapp/ajax/footer.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/footer.jsp
rename to webapps/showcase/src/main/webapp/ajax/footer.jsp
diff --git a/webapps/showcase/src/webapp/ajax/index.jsp b/webapps/showcase/src/main/webapp/ajax/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/index.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example1.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example1.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example1.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example2.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example2.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example2.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example3.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example3.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example3.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example4.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example4.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example4.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example5.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example5.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example5.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example6.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example6.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example6.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/example7.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/example7.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/example7.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotediv/index.jsp b/webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotediv/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotediv/index.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remoteforms/index.jsp b/webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remoteforms/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remoteforms/test1.jsp b/webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remoteforms/test1.jsp
rename to webapps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remoteforms/test2.jsp b/webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remoteforms/test2.jsp
rename to webapps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remoteforms/test3.jsp b/webapps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remoteforms/test3.jsp
rename to webapps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
diff --git a/webapps/showcase/src/webapp/ajax/remotelink/index.jsp b/webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/remotelink/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/remotelink/index.jsp
diff --git a/webapps/showcase/src/webapp/ajax/tabbedpanel/example1.jsp b/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/tabbedpanel/example1.jsp
rename to webapps/showcase/src/main/webapp/ajax/tabbedpanel/example1.jsp
diff --git a/webapps/showcase/src/webapp/ajax/tabbedpanel/example2.jsp b/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/tabbedpanel/example2.jsp
rename to webapps/showcase/src/main/webapp/ajax/tabbedpanel/example2.jsp
diff --git a/webapps/showcase/src/webapp/ajax/tabbedpanel/example3.jsp b/webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/tabbedpanel/example3.jsp
rename to webapps/showcase/src/main/webapp/ajax/tabbedpanel/example3.jsp
diff --git a/webapps/showcase/src/webapp/ajax/tabbedpanel/index.jsp b/webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/tabbedpanel/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp
diff --git a/webapps/showcase/src/webapp/ajax/testjs.jsp b/webapps/showcase/src/main/webapp/ajax/testjs.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/testjs.jsp
rename to webapps/showcase/src/main/webapp/ajax/testjs.jsp
diff --git a/webapps/showcase/src/webapp/ajax/widgets/index.jsp b/webapps/showcase/src/main/webapp/ajax/widgets/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/ajax/widgets/index.jsp
rename to webapps/showcase/src/main/webapp/ajax/widgets/index.jsp
diff --git a/webapps/showcase/src/webapp/continuations/guess.ftl b/webapps/showcase/src/main/webapp/continuations/guess.ftl
similarity index 100%
rename from webapps/showcase/src/webapp/continuations/guess.ftl
rename to webapps/showcase/src/main/webapp/continuations/guess.ftl
diff --git a/webapps/showcase/src/webapp/date.jsp b/webapps/showcase/src/main/webapp/date.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/date.jsp
rename to webapps/showcase/src/main/webapp/date.jsp
diff --git a/webapps/showcase/src/webapp/empmanager/editEmployee.jsp b/webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/empmanager/editEmployee.jsp
rename to webapps/showcase/src/main/webapp/empmanager/editEmployee.jsp
diff --git a/webapps/showcase/src/webapp/empmanager/editSkill.jsp b/webapps/showcase/src/main/webapp/empmanager/editSkill.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/empmanager/editSkill.jsp
rename to webapps/showcase/src/main/webapp/empmanager/editSkill.jsp
diff --git a/webapps/showcase/src/webapp/empmanager/index.jsp b/webapps/showcase/src/main/webapp/empmanager/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/empmanager/index.jsp
rename to webapps/showcase/src/main/webapp/empmanager/index.jsp
diff --git a/webapps/showcase/src/webapp/empmanager/listEmployees.jsp b/webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/empmanager/listEmployees.jsp
rename to webapps/showcase/src/main/webapp/empmanager/listEmployees.jsp
diff --git a/webapps/showcase/src/webapp/empmanager/listSkills.jsp b/webapps/showcase/src/main/webapp/empmanager/listSkills.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/empmanager/listSkills.jsp
rename to webapps/showcase/src/main/webapp/empmanager/listSkills.jsp
diff --git a/webapps/showcase/src/webapp/filedownload/index.jsp b/webapps/showcase/src/main/webapp/filedownload/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/filedownload/index.jsp
rename to webapps/showcase/src/main/webapp/filedownload/index.jsp
diff --git a/webapps/showcase/src/webapp/fileupload/upload-success.jsp b/webapps/showcase/src/main/webapp/fileupload/upload-success.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/fileupload/upload-success.jsp
rename to webapps/showcase/src/main/webapp/fileupload/upload-success.jsp
diff --git a/webapps/showcase/src/webapp/fileupload/upload.jsp b/webapps/showcase/src/main/webapp/fileupload/upload.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/fileupload/upload.jsp
rename to webapps/showcase/src/main/webapp/fileupload/upload.jsp
diff --git a/webapps/showcase/src/webapp/help.jsp b/webapps/showcase/src/main/webapp/help.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/help.jsp
rename to webapps/showcase/src/main/webapp/help.jsp
diff --git a/webapps/showcase/src/webapp/images/logo-small.png b/webapps/showcase/src/main/webapp/images/logo-small.png
similarity index 100%
rename from webapps/showcase/src/webapp/images/logo-small.png
rename to webapps/showcase/src/main/webapp/images/logo-small.png
diff --git a/webapps/showcase/src/webapp/images/logo.png b/webapps/showcase/src/main/webapp/images/logo.png
similarity index 100%
rename from webapps/showcase/src/webapp/images/logo.png
rename to webapps/showcase/src/main/webapp/images/logo.png
diff --git a/webapps/showcase/src/webapp/index.jsp b/webapps/showcase/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/index.jsp
rename to webapps/showcase/src/main/webapp/index.jsp
diff --git a/webapps/showcase/src/webapp/jasper/sample_report.jrxml b/webapps/showcase/src/main/webapp/jasper/sample_report.jrxml
similarity index 100%
rename from webapps/showcase/src/webapp/jasper/sample_report.jrxml
rename to webapps/showcase/src/main/webapp/jasper/sample_report.jrxml
diff --git a/webapps/showcase/src/webapp/modelDriven/modelDriven.jsp b/webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/modelDriven/modelDriven.jsp
rename to webapps/showcase/src/main/webapp/modelDriven/modelDriven.jsp
diff --git a/webapps/showcase/src/webapp/modelDriven/modelDrivenResult.jsp b/webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/modelDriven/modelDrivenResult.jsp
rename to webapps/showcase/src/main/webapp/modelDriven/modelDrivenResult.jsp
diff --git a/webapps/showcase/src/webapp/person/editPeople.jsp b/webapps/showcase/src/main/webapp/person/editPeople.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/person/editPeople.jsp
rename to webapps/showcase/src/main/webapp/person/editPeople.jsp
diff --git a/webapps/showcase/src/webapp/person/index.jsp b/webapps/showcase/src/main/webapp/person/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/person/index.jsp
rename to webapps/showcase/src/main/webapp/person/index.jsp
diff --git a/webapps/showcase/src/webapp/person/listPeople.ftl b/webapps/showcase/src/main/webapp/person/listPeople.ftl
similarity index 100%
rename from webapps/showcase/src/webapp/person/listPeople.ftl
rename to webapps/showcase/src/main/webapp/person/listPeople.ftl
diff --git a/webapps/showcase/src/webapp/person/newPerson.ftl b/webapps/showcase/src/main/webapp/person/newPerson.ftl
similarity index 100%
rename from webapps/showcase/src/webapp/person/newPerson.ftl
rename to webapps/showcase/src/main/webapp/person/newPerson.ftl
diff --git a/webapps/showcase/src/webapp/showcase.jsp b/webapps/showcase/src/main/webapp/showcase.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/showcase.jsp
rename to webapps/showcase/src/main/webapp/showcase.jsp
diff --git a/webapps/showcase/src/webapp/styles/forms.css b/webapps/showcase/src/main/webapp/styles/forms.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/forms.css
rename to webapps/showcase/src/main/webapp/styles/forms.css
diff --git a/webapps/showcase/src/webapp/styles/layout-navtop-1col.css b/webapps/showcase/src/main/webapp/styles/layout-navtop-1col.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/layout-navtop-1col.css
rename to webapps/showcase/src/main/webapp/styles/layout-navtop-1col.css
diff --git a/webapps/showcase/src/webapp/styles/layout-navtop-localleft.css b/webapps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/layout-navtop-localleft.css
rename to webapps/showcase/src/main/webapp/styles/layout-navtop-localleft.css
diff --git a/webapps/showcase/src/webapp/styles/layout.css b/webapps/showcase/src/main/webapp/styles/layout.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/layout.css
rename to webapps/showcase/src/main/webapp/styles/layout.css
diff --git a/webapps/showcase/src/webapp/styles/main.css b/webapps/showcase/src/main/webapp/styles/main.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/main.css
rename to webapps/showcase/src/main/webapp/styles/main.css
diff --git a/webapps/showcase/src/webapp/styles/nav-horizontal.css b/webapps/showcase/src/main/webapp/styles/nav-horizontal.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/nav-horizontal.css
rename to webapps/showcase/src/main/webapp/styles/nav-horizontal.css
diff --git a/webapps/showcase/src/webapp/styles/tools.css b/webapps/showcase/src/main/webapp/styles/tools.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/tools.css
rename to webapps/showcase/src/main/webapp/styles/tools.css
diff --git a/webapps/showcase/src/webapp/styles/typo.css b/webapps/showcase/src/main/webapp/styles/typo.css
similarity index 100%
rename from webapps/showcase/src/webapp/styles/typo.css
rename to webapps/showcase/src/main/webapp/styles/typo.css
diff --git a/webapps/showcase/src/webapp/tags/index.jsp b/webapps/showcase/src/main/webapp/tags/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/index.jsp
rename to webapps/showcase/src/main/webapp/tags/index.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage2.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage2.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage2.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage3.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/actionTag/includedPage3.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/actionTag/includedPage3.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/actionTag/showActionTagDemo.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/date.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/date.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/date.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/date.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/index.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/index.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/index.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showAppendIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showIteratorGeneratorTagDemo.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/showMergeIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemo.jsp
diff --git a/webapps/showcase/src/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp b/webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
rename to webapps/showcase/src/main/webapp/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/example.jsp b/webapps/showcase/src/main/webapp/tags/ui/example.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/example.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/example.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/example.vm b/webapps/showcase/src/main/webapp/tags/ui/example.vm
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/example.vm
rename to webapps/showcase/src/main/webapp/tags/ui/example.vm
diff --git a/webapps/showcase/src/webapp/tags/ui/exampleSubmited.jsp b/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/exampleSubmited.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/exampleSubmited.vm b/webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/exampleSubmited.vm
rename to webapps/showcase/src/main/webapp/tags/ui/exampleSubmited.vm
diff --git a/webapps/showcase/src/webapp/tags/ui/images/backgroundImage.jpg b/webapps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/images/backgroundImage.jpg
rename to webapps/showcase/src/main/webapp/tags/ui/images/backgroundImage.jpg
diff --git a/webapps/showcase/src/webapp/tags/ui/images/leopard.jpg b/webapps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/images/leopard.jpg
rename to webapps/showcase/src/main/webapp/tags/ui/images/leopard.jpg
diff --git a/webapps/showcase/src/webapp/tags/ui/index.jsp b/webapps/showcase/src/main/webapp/tags/ui/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/index.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/index.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/lotsOfOptiontransferselect.jsp b/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/lotsOfOptiontransferselect.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp b/webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselectSubmit.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/lotsOfRichtexteditor.jsp b/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/lotsOfRichtexteditor.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditor.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp b/webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/lotsOfRichtexteditorSubmit.jsp
diff --git a/webapps/showcase/src/webapp/tags/ui/tooltipExample.jsp b/webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/tags/ui/tooltipExample.jsp
rename to webapps/showcase/src/main/webapp/tags/ui/tooltipExample.jsp
diff --git a/webapps/showcase/src/webapp/token/doublePost.jsp b/webapps/showcase/src/main/webapp/token/doublePost.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/doublePost.jsp
rename to webapps/showcase/src/main/webapp/token/doublePost.jsp
diff --git a/webapps/showcase/src/webapp/token/example1.jsp b/webapps/showcase/src/main/webapp/token/example1.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/example1.jsp
rename to webapps/showcase/src/main/webapp/token/example1.jsp
diff --git a/webapps/showcase/src/webapp/token/example2.jsp b/webapps/showcase/src/main/webapp/token/example2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/example2.jsp
rename to webapps/showcase/src/main/webapp/token/example2.jsp
diff --git a/webapps/showcase/src/webapp/token/example3.jsp b/webapps/showcase/src/main/webapp/token/example3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/example3.jsp
rename to webapps/showcase/src/main/webapp/token/example3.jsp
diff --git a/webapps/showcase/src/webapp/token/example4.ftl b/webapps/showcase/src/main/webapp/token/example4.ftl
similarity index 100%
rename from webapps/showcase/src/webapp/token/example4.ftl
rename to webapps/showcase/src/main/webapp/token/example4.ftl
diff --git a/webapps/showcase/src/webapp/token/index.jsp b/webapps/showcase/src/main/webapp/token/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/index.jsp
rename to webapps/showcase/src/main/webapp/token/index.jsp
diff --git a/webapps/showcase/src/webapp/token/transferDone.jsp b/webapps/showcase/src/main/webapp/token/transferDone.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/token/transferDone.jsp
rename to webapps/showcase/src/main/webapp/token/transferDone.jsp
diff --git a/webapps/showcase/src/webapp/validation/clientSideValidationExample.jsp b/webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/clientSideValidationExample.jsp
rename to webapps/showcase/src/main/webapp/validation/clientSideValidationExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/fieldValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/fieldValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/fieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/footer.jsp b/webapps/showcase/src/main/webapp/validation/footer.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/footer.jsp
rename to webapps/showcase/src/main/webapp/validation/footer.jsp
diff --git a/webapps/showcase/src/webapp/validation/index.jsp b/webapps/showcase/src/main/webapp/validation/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/index.jsp
rename to webapps/showcase/src/main/webapp/validation/index.jsp
diff --git a/webapps/showcase/src/webapp/validation/nonFieldValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/nonFieldValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/nonFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/quiz-ajax.jsp b/webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/quiz-ajax.jsp
rename to webapps/showcase/src/main/webapp/validation/quiz-ajax.jsp
diff --git a/webapps/showcase/src/webapp/validation/quiz-basic.jsp b/webapps/showcase/src/main/webapp/validation/quiz-basic.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/quiz-basic.jsp
rename to webapps/showcase/src/main/webapp/validation/quiz-basic.jsp
diff --git a/webapps/showcase/src/webapp/validation/quiz-client-css.jsp b/webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/quiz-client-css.jsp
rename to webapps/showcase/src/main/webapp/validation/quiz-client-css.jsp
diff --git a/webapps/showcase/src/webapp/validation/quiz-client.jsp b/webapps/showcase/src/main/webapp/validation/quiz-client.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/quiz-client.jsp
rename to webapps/showcase/src/main/webapp/validation/quiz-client.jsp
diff --git a/webapps/showcase/src/webapp/validation/quiz-success.jsp b/webapps/showcase/src/main/webapp/validation/quiz-success.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/quiz-success.jsp
rename to webapps/showcase/src/main/webapp/validation/quiz-success.jsp
diff --git a/webapps/showcase/src/webapp/validation/successClientSideValidationExample.jsp b/webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/successClientSideValidationExample.jsp
rename to webapps/showcase/src/main/webapp/validation/successClientSideValidationExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/successFieldValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/successFieldValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/successFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/successNonFieldValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/successNonFieldValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/successNonFieldValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/successVisitorValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/successVisitorValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/successVisitorValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/validation/validationExamplesStyles.css b/webapps/showcase/src/main/webapp/validation/validationExamplesStyles.css
similarity index 100%
rename from webapps/showcase/src/webapp/validation/validationExamplesStyles.css
rename to webapps/showcase/src/main/webapp/validation/validationExamplesStyles.css
diff --git a/webapps/showcase/src/webapp/validation/visitorValidatorsExample.jsp b/webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/validation/visitorValidatorsExample.jsp
rename to webapps/showcase/src/main/webapp/validation/visitorValidatorsExample.jsp
diff --git a/webapps/showcase/src/webapp/wait/complete.jsp b/webapps/showcase/src/main/webapp/wait/complete.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/complete.jsp
rename to webapps/showcase/src/main/webapp/wait/complete.jsp
diff --git a/webapps/showcase/src/webapp/wait/example1.jsp b/webapps/showcase/src/main/webapp/wait/example1.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/example1.jsp
rename to webapps/showcase/src/main/webapp/wait/example1.jsp
diff --git a/webapps/showcase/src/webapp/wait/example2.jsp b/webapps/showcase/src/main/webapp/wait/example2.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/example2.jsp
rename to webapps/showcase/src/main/webapp/wait/example2.jsp
diff --git a/webapps/showcase/src/webapp/wait/example3.jsp b/webapps/showcase/src/main/webapp/wait/example3.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/example3.jsp
rename to webapps/showcase/src/main/webapp/wait/example3.jsp
diff --git a/webapps/showcase/src/webapp/wait/index.jsp b/webapps/showcase/src/main/webapp/wait/index.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/index.jsp
rename to webapps/showcase/src/main/webapp/wait/index.jsp
diff --git a/webapps/showcase/src/webapp/wait/wait.jsp b/webapps/showcase/src/main/webapp/wait/wait.jsp
similarity index 100%
rename from webapps/showcase/src/webapp/wait/wait.jsp
rename to webapps/showcase/src/main/webapp/wait/wait.jsp
diff --git a/webapps/starter/Starter.iml b/webapps/starter/Starter.iml
deleted file mode 100644
index cb3db31bd..000000000
--- a/webapps/starter/Starter.iml
+++ /dev/null
@@ -1,515 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="J2EE_WEB_MODULE" j2ee-integration="Tomcat Server">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/java" />
-    <exclude-output />
-    <exclude-exploded />
-    <output-test url="file://$MODULE_DIR$/build/test" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="WebWork" />
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-  <component name="WebModuleBuildComponent">
-    <setting name="EXPLODED_URL" value="file://" />
-    <setting name="EXPLODED_ENABLED" value="false" />
-    <setting name="JAR_URL" value="file://" />
-    <setting name="JAR_ENABLED" value="false" />
-    <setting name="SYNC_EXPLODED_DIR" value="true" />
-    <setting name="BUILD_ON_FRAME_DEACTIVATION" value="false" />
-    <setting name="RUN_JASPER_VALIDATION" value="false" />
-  </component>
-  <component name="WebModuleProperties">
-    <containerElement type="module" name="WebWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="module" name="XWork">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/classes" />
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dwr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/ajax/dwr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock-cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock-cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jmock.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/jmock.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3-j2ee1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3-j2ee1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet-web-module.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet-web-module.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xdoclet.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xdoclet.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xjavadoc.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/build/xjavadoc.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cewolf.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/cewolf/cewolf.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cos.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-cos/cos.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/multipartrequest.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload-pell/multipartrequest.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-fileupload.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/fileupload/commons-fileupload.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/freemarker.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/freemarker/freemarker.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/antlr.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/antlr.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/asm.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/asm.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/cglib.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ehcache.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/ehcache.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/hibernate.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/hibernate/hibernate.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-beanutils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-beanutils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-digester.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/commons-digester.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/itext.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/itext.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasperreports.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/jasperreports.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/poi.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jasperreports/poi.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jfreechart.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/jfree/jfreechart.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer-nanowar.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer-nanowar.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/nanocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/nanocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer-gems.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer-gems.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/picocontainer.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/pico/picocontainer.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/classworlds.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/classworlds.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-container-default.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-container-default.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/plexus-utils.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/plexus/plexus-utils.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/portlet-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/portlet/portlet-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ant.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/ant.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-el.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-el.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-io.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-io.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-lang.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/commons-lang.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler-jdt.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler-jdt.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-compiler.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-compiler.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jasper-runtime.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jasper-runtime.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jsp-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/jsp-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/log4j.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/log4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/org.mortbay.jetty.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/org.mortbay.jetty.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xstream.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/quickstart/xstream.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/sitemesh.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/sitemesh/sitemesh.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/xwork-src.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/source/xwork-src.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-collections.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/commons-collections.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-dep.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-dep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/velocity-tools-view.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/velocity/velocity-tools-view.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/dom.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/jcommon.jar" />
-      <url>jar://$MODULE_DIR$/../../lib/xslt/jcommon.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/clover.jar" />
-      <url>jar://$xwork$/lib/build/clover.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/dom4j.jar" />
-      <url>jar://$xwork$/lib/build/dom4j.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/junit.jar" />
-      <url>jar://$xwork$/lib/build/junit.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-alt-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-alt-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-core.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/mockobjects-jdk1.3.jar" />
-      <url>jar://$xwork$/lib/build/mockobjects-jdk1.3.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/default/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/javamail.jar" />
-      <url>jar://$xwork$/lib/default/javamail.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/ognl.jar" />
-      <url>jar://$xwork$/lib/default/ognl.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/oscore.jar" />
-      <url>jar://$xwork$/lib/default/oscore.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/rife-continuations.jar" />
-      <url>jar://$xwork$/lib/default/rife-continuations.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/cglib-nodep.jar" />
-      <url>jar://$xwork$/lib/spring/cglib-nodep.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-attributes-api.jar" />
-      <url>jar://$xwork$/lib/spring/commons-attributes-api.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/commons-logging.jar" />
-      <url>jar://$xwork$/lib/spring/commons-logging.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-aop.jar" />
-      <url>jar://$xwork$/lib/spring/spring-aop.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-beans.jar" />
-      <url>jar://$xwork$/lib/spring/spring-beans.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-context.jar" />
-      <url>jar://$xwork$/lib/spring/spring-context.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-core.jar" />
-      <url>jar://$xwork$/lib/spring/spring-core.jar!/</url>
-    </containerElement>
-    <containerElement type="library" level="module">
-      <attribute name="method" value="1" />
-      <attribute name="URI" value="/WEB-INF/lib/spring-web.jar" />
-      <url>jar://$xwork$/lib/spring/spring-web.jar!/</url>
-    </containerElement>
-    <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" optional="false" version="2.3" />
-    <webroots>
-      <root url="file://$MODULE_DIR$/src/webapp" relative="/" />
-    </webroots>
-  </component>
-  <component name="WeblogicWebModuleProperties">
-    <option name="IS_RUN_APPC" value="false" />
-  </component>
-  <component name="com.fuhrer.idea.plugin.jboss.JBossWebModule" />
-</module>
-
diff --git a/webapps/starter/pom.xml b/webapps/starter/pom.xml
new file mode 100644
index 000000000..b28344f73
--- /dev/null
+++ b/webapps/starter/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <groupId>org.apache.struts.action2</groupId>
+      <artifactId>webapps</artifactId>
+      <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts.action2</groupId>
+    <version>2.0-SNAPSHOT</version>
+    <artifactId>webapp-starter</artifactId>
+    <packaging>war</packaging>
+    <name>Starter Webapp</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.4</jdkName>
+                    <exclude>target,test-output,.clover</exclude>
+                    <useShortDependencyNames>true</useShortDependencyNames>
+                    <libraries>
+                        <library>
+                            <name>xwork</name>
+                            <sources>file://$xwork$/src/java</sources>
+                        </library>
+                        <library>
+                            <name>xwork-tiger</name>
+                            <sources>file://$xwork$/tiger/src/java</sources>
+                        </library>
+                    </libraries>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                  <source>1.4</source>
+                  <target>1.4</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts.action2</groupId>
+            <artifactId>action</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/webapps/starter/src/java/com/foo/example/CounterBean.java b/webapps/starter/src/main/java/com/foo/example/CounterBean.java
similarity index 100%
rename from webapps/starter/src/java/com/foo/example/CounterBean.java
rename to webapps/starter/src/main/java/com/foo/example/CounterBean.java
diff --git a/webapps/starter/src/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml b/webapps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
similarity index 100%
rename from webapps/starter/src/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
rename to webapps/starter/src/main/java/com/foo/example/HelloMatrixAction-helloMatrixSubmit-validation.xml
diff --git a/webapps/starter/src/java/com/foo/example/HelloMatrixAction.java b/webapps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
similarity index 100%
rename from webapps/starter/src/java/com/foo/example/HelloMatrixAction.java
rename to webapps/starter/src/main/java/com/foo/example/HelloMatrixAction.java
diff --git a/webapps/starter/src/java/com/foo/example/HomeAction.java b/webapps/starter/src/main/java/com/foo/example/HomeAction.java
similarity index 100%
rename from webapps/starter/src/java/com/foo/example/HomeAction.java
rename to webapps/starter/src/main/java/com/foo/example/HomeAction.java
diff --git a/webapps/starter/src/webapp/WEB-INF/applicationContext.xml b/webapps/starter/src/main/webapp/WEB-INF/applicationContext.xml
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/applicationContext.xml
rename to webapps/starter/src/main/webapp/WEB-INF/applicationContext.xml
diff --git a/webapps/starter/src/webapp/WEB-INF/classes/struts.properties b/webapps/starter/src/main/webapp/WEB-INF/classes/struts.properties
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/classes/struts.properties
rename to webapps/starter/src/main/webapp/WEB-INF/classes/struts.properties
diff --git a/webapps/starter/src/webapp/WEB-INF/classes/xwork.xml b/webapps/starter/src/main/webapp/WEB-INF/classes/xwork.xml
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/classes/xwork.xml
rename to webapps/starter/src/main/webapp/WEB-INF/classes/xwork.xml
diff --git a/webapps/starter/src/webapp/WEB-INF/pages/hellomatrix-success.ftl b/webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/pages/hellomatrix-success.ftl
rename to webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix-success.ftl
diff --git a/webapps/starter/src/webapp/WEB-INF/pages/hellomatrix.jsp b/webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/pages/hellomatrix.jsp
rename to webapps/starter/src/main/webapp/WEB-INF/pages/hellomatrix.jsp
diff --git a/webapps/starter/src/webapp/WEB-INF/pages/home.jsp b/webapps/starter/src/main/webapp/WEB-INF/pages/home.jsp
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/pages/home.jsp
rename to webapps/starter/src/main/webapp/WEB-INF/pages/home.jsp
diff --git a/webapps/starter/src/webapp/WEB-INF/web.xml b/webapps/starter/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapps/starter/src/webapp/WEB-INF/web.xml
rename to webapps/starter/src/main/webapp/WEB-INF/web.xml
diff --git a/webapps/starter/src/webapp/index.jsp b/webapps/starter/src/main/webapp/index.jsp
similarity index 100%
rename from webapps/starter/src/webapp/index.jsp
rename to webapps/starter/src/main/webapp/index.jsp
diff --git a/www/index.html b/www/index.html
deleted file mode 100644
index 1526b3a80..000000000
--- a/www/index.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-  <body>
-WebWork is a Java web-application development framework. It is built specifically with developer productivity and code simplicity in mind. WebWork is built on top of XWork, which provides a generic command pattern framework as well as an Inversion of Control container. In addition to these features, WebWork provides robust support for building reusable UI templates, such as form controls, UI themes, internationalization, dynamic form parameter mapping to JavaBeans, robust client and server side validation, and much more.
-<p/>
-WebWork's homepage is <a href="http://www.opensymphony.com/webwork">http://www.opensymphony.com/webwork</a>
-  </body>
-</html>
diff --git a/www/project_tools.html b/www/project_tools.html
deleted file mode 100644
index 6ec8be3ff..000000000
--- a/www/project_tools.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div><a href="http://www.opensymphony.com">OpenSymphony</a></div>
-<div><a href="http://www.opensymphony.com/webwork">Documentation</a></div>
-<div><a href="http://jira.opensymphony.com/secure/BrowseProject.jspa?id=10030">Bug Tracker</a></div>
-<div><a href="http://wiki.opensymphony.com/display/WW">Wiki</a></div>
\ No newline at end of file