Return-Path: 
 <commits-return-3423-apmail-struts-commits-archive=struts.apache.org@struts.apache.org>
Delivered-To: apmail-struts-commits-archive@locus.apache.org
Received: (qmail 14703 invoked from network); 11 Mar 2007 21:59:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 11 Mar 2007 21:59:13 -0000
Received: (qmail 20435 invoked by uid 500); 11 Mar 2007 21:59:20 -0000
Delivered-To: apmail-struts-commits-archive@struts.apache.org
Received: (qmail 20383 invoked by uid 500); 11 Mar 2007 21:59:20 -0000
Mailing-List: contact commits-help@struts.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@struts.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@struts.apache.org>
List-Post: <mailto:commits@struts.apache.org>
List-Id: <commits.struts.apache.org>
Reply-To: dev@struts.apache.org
Delivered-To: mailing list commits@struts.apache.org
Received: (qmail 20374 invoked by uid 99); 11 Mar 2007 21:59:20 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Mar 2007 14:59:20 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 Mar 2007 13:59:11 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 023901A9838; Sun, 11 Mar 2007 14:58:50 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r517026 - in
 /struts/struts2/branches/STRUTS_2_0_X/apps/mailreader: pom.xml
 src/main/java/applicationContext.xml
 src/main/java/mailreader2/MailreaderSupport.java
 src/main/webapp/WEB-INF/web.xml
Date: Sun, 11 Mar 2007 21:58:50 -0000
To: commits@struts.apache.org
From: husted@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070311215851.023901A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: husted
Date: Sun Mar 11 14:58:50 2007
New Revision: 517026

URL: http://svn.apache.org/viewvc?view=rev&rev=517026
Log:
WW-1801 Remove Spring dependency by copying properties manually. 


Removed:
    struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/applicationContext.xml
Modified:
    struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
    struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
    struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/WEB-INF/web.xml

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml?view=diff&rev=517026&r1=517025&r2=517026
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/pom.xml Sun Mar 11 14:58:50 2007
@@ -31,11 +31,6 @@
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java?view=diff&rev=517026&r1=517025&r2=517026
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java Sun Mar 11 14:58:50 2007
@@ -32,8 +32,6 @@
 import org.apache.struts.apps.mailreader.dao.UserDatabase;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemorySubscription;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUser;
-import org.springframework.beans.BeanUtils;
-
 import java.util.Map;
 
 /**
@@ -63,6 +61,28 @@
         return Constants.CANCEL;
     }
 
+    /**
+     * Convenience method to copy User properties.
+     **/
+    protected void copyUser(User source, User target) {
+      if ((source==null) || (target==null)) return;
+      target.setFromAddress(source.getFromAddress());
+      target.setFullName(source.getFullName());
+      target.setPassword(source.getPassword());
+      target.setReplyToAddress(source.getReplyToAddress());
+    }
+
+    /**
+     * Convenience method to copy Subscription properties.
+     **/
+    protected void copySubscription(Subscription source, Subscription target) {
+      if ((source==null) || (target==null)) return;
+      target.setAutoConnect(source.getAutoConnect());
+      target.setPassword(source.getPassword());
+      target.setType(source.getType());
+      target.setUsername(source.getUsername());
+    }
+
 
     // ---- ApplicationAware ----
 
@@ -435,7 +455,7 @@
         input.setPassword(_password);
         User user = createUser(_username, _password);
         if (null != user) {
-            BeanUtils.copyProperties(input,user);
+            copyUser(input,user);
             setUser(user);
         }
     }
@@ -532,7 +552,7 @@
         Subscription input = getSubscription();
         Subscription sub = createSubscription(host);
         if (null != sub) {
-            BeanUtils.copyProperties(input, sub);
+            copySubscription(input, sub);
             setSubscription(sub);
             setHost(sub.getHost());
         }

Modified: struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/WEB-INF/web.xml?view=diff&rev=517026&r1=517025&r2=517026
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/branches/STRUTS_2_0_X/apps/mailreader/src/main/webapp/WEB-INF/web.xml Sun Mar 11 14:58:50 2007
@@ -4,11 +4,6 @@
 
     <display-name>Struts 2 Mailreader</display-name>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>classpath*:applicationContext*.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>Struts2</filter-name>
         <filter-class>
@@ -21,19 +16,13 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
     <!-- Application Listener for Mailreader database -->
     <listener>
         <listener-class>
             mailreader2.ApplicationListener
         </listener-class>
     </listener>
-       
+
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>