From 76af0a88bd89f6a3efd9ac79e32908a31a3646fd Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Fri, 1 Sep 2006 03:28:21 +0000
Subject: [PATCH] WW-1429 Reposition resources to please Maven build.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@439157 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/{java => resources}/mailreader-default.xml          | 0
 .../src/main/{java => resources}/mailreader-support.xml          | 0
 .../{java => resources}/mailreader2/MailreaderSupport.properties | 0
 .../mailreader2/MailreaderSupport_ja.properties                  | 0
 .../mailreader2/MailreaderSupport_ru.properties                  | 0
 apps/mailreader/src/main/{java => resources}/struts.properties   | 1 +
 apps/mailreader/src/main/{java => resources}/struts.xml          | 0
 .../struts2/showcase/tutorial => resources}/struts-tutorial.xml  | 0
 8 files changed, 1 insertion(+)
 rename apps/mailreader/src/main/{java => resources}/mailreader-default.xml (100%)
 rename apps/mailreader/src/main/{java => resources}/mailreader-support.xml (100%)
 rename apps/mailreader/src/main/{java => resources}/mailreader2/MailreaderSupport.properties (100%)
 rename apps/mailreader/src/main/{java => resources}/mailreader2/MailreaderSupport_ja.properties (100%)
 rename apps/mailreader/src/main/{java => resources}/mailreader2/MailreaderSupport_ru.properties (100%)
 rename apps/mailreader/src/main/{java => resources}/struts.properties (74%)
 rename apps/mailreader/src/main/{java => resources}/struts.xml (100%)
 rename apps/showcase/src/main/{java/org/apache/struts2/showcase/tutorial => resources}/struts-tutorial.xml (100%)

diff --git a/apps/mailreader/src/main/java/mailreader-default.xml b/apps/mailreader/src/main/resources/mailreader-default.xml
similarity index 100%
rename from apps/mailreader/src/main/java/mailreader-default.xml
rename to apps/mailreader/src/main/resources/mailreader-default.xml
diff --git a/apps/mailreader/src/main/java/mailreader-support.xml b/apps/mailreader/src/main/resources/mailreader-support.xml
similarity index 100%
rename from apps/mailreader/src/main/java/mailreader-support.xml
rename to apps/mailreader/src/main/resources/mailreader-support.xml
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties b/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties
similarity index 100%
rename from apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
rename to apps/mailreader/src/main/resources/mailreader2/MailreaderSupport.properties
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties b/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties
similarity index 100%
rename from apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
rename to apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ja.properties
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties b/apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ru.properties
similarity index 100%
rename from apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
rename to apps/mailreader/src/main/resources/mailreader2/MailreaderSupport_ru.properties
diff --git a/apps/mailreader/src/main/java/struts.properties b/apps/mailreader/src/main/resources/struts.properties
similarity index 74%
rename from apps/mailreader/src/main/java/struts.properties
rename to apps/mailreader/src/main/resources/struts.properties
index d7bcc1b96..15de55115 100644
--- a/apps/mailreader/src/main/java/struts.properties
+++ b/apps/mailreader/src/main/resources/struts.properties
@@ -1,3 +1,4 @@
+struts.objectFactory = spring
 struts.devMode = true
 struts.action.extension = do
 struts.enable.DynamicMethodInvocation = false
diff --git a/apps/mailreader/src/main/java/struts.xml b/apps/mailreader/src/main/resources/struts.xml
similarity index 100%
rename from apps/mailreader/src/main/java/struts.xml
rename to apps/mailreader/src/main/resources/struts.xml
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml b/apps/showcase/src/main/resources/struts-tutorial.xml
similarity index 100%
rename from apps/showcase/src/main/java/org/apache/struts2/showcase/tutorial/struts-tutorial.xml
rename to apps/showcase/src/main/resources/struts-tutorial.xml