svn commit: r454616 - in /struts/struts2/trunk/apps/mailreader: ./ src/main/java/ src/main/java/mailreader2/ src/main/resources/ src/main/webapp/WEB-INF/

[jmitchell]

Author: jmitchell
Date: Mon Oct  9 21:58:51 2006
New Revision: 454616

URL: http://svn.apache.org/viewvc?view=rev&rev=454616
Log:
WW-1453
 - fixing mailreader to correctly load the database.xml file from WEB-INF
 - fix the pom.xml to correctly use src/main/java as the resource path for 
*.xml and *.properties



Added:
    struts/struts2/trunk/apps/mailreader/src/main/java/alternate.properties
      - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate.properties
    struts/struts2/trunk/apps/mailreader/src/main/java/alternate_ja.properties
      - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate_ja.properties
    struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/database.xml
      - copied unchanged from r454597, 
struts/struts2/trunk/apps/mailreader/src/main/resources/database.xml
Removed:
    struts/struts2/trunk/apps/mailreader/src/main/resources/alternate.properties
    
struts/struts2/trunk/apps/mailreader/src/main/resources/alternate_ja.properties
    struts/struts2/trunk/apps/mailreader/src/main/resources/database.xml
Modified:
    struts/struts2/trunk/apps/mailreader/pom.xml
    
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?view=diff&rev=454616&r1=454615&r2=454616
==============================================================================
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Mon Oct  9 21:58:51 2006
@@ -28,6 +28,15 @@
     </dependencies>
     
     <build>
+       <resources>
+               <resource>
+                       <directory>src/main/java</directory>
+                       <includes>
+                               <include>**/*.xml</include>
+                               <include>**/*.properties</include>
+                       </includes>
+               </resource>
+       </resources>
        <plugins>
                <plugin>
                        <groupId>org.mortbay.jetty</groupId>

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java?view=diff&rev=454616&r1=454615&r2=454616
==============================================================================
--- 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
 (original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
 Mon Oct  9 21:58:51 2006
@@ -100,7 +100,7 @@
      * <p>The web application resource path of our persistent database storage
      * file.</p>
      */
-    private String pathname = "/WEB-INF/classes/database.xml";
+    private String pathname = "/WEB-INF/database.xml";
 
     /**
      * <p>Return the application resource path to the database.</p>