Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 11840 invoked from network); 3 Jul 2006 23:53:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jul 2006 23:53:21 -0000 Received: (qmail 93179 invoked by uid 500); 3 Jul 2006 23:53:19 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 93134 invoked by uid 500); 3 Jul 2006 23:53:19 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 93125 invoked by uid 99); 3 Jul 2006 23:53:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 16:53:19 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jul 2006 16:53:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 5DD921A983A; Mon, 3 Jul 2006 16:52:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418878 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java Date: Mon, 03 Jul 2006 23:52:58 -0000 To: commits@struts.apache.org From: mrdon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060703235258.5DD921A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mrdon Date: Mon Jul 3 16:52:57 2006 New Revision: 418878 URL: http://svn.apache.org/viewvc?rev=418878&view=rev Log: Changing dispatcher to load both struts.xml and xwork.xml configuration files WW-1370 Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java?rev=418878&r1=418877&r2=418878&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DispatcherUtils.java Mon Jul 3 16:52:57 2006 @@ -32,6 +32,7 @@ import com.opensymphony.xwork.*; import com.opensymphony.xwork.config.ConfigurationException; import com.opensymphony.xwork.config.ConfigurationManager; +import com.opensymphony.xwork.config.providers.XmlConfigurationProvider; import com.opensymphony.xwork.util.*; import com.opensymphony.xwork.util.location.Location; import com.opensymphony.xwork.util.location.LocationUtils; @@ -213,6 +214,8 @@ } configurationManager = new ConfigurationManager(); + configurationManager.addConfigurationProvider(new XmlConfigurationProvider("xwork.xml", false)); + configurationManager.addConfigurationProvider(new XmlConfigurationProvider("struts.xml", false)); synchronized(DispatcherUtils.class) { if (dispatcherListeners.size() > 0) {