Author: pbenedict
Date: Sat Nov 3 19:58:55 2007
New Revision: 591730
URL: http://svn.apache.org/viewvc?rev=591730&view=rev
Log:
STR-3111: Allow <set-property> as a top-level element
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java?rev=591730&r1=591729&r2=591730&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
Sat Nov 3 19:58:55 2007
@@ -53,6 +53,9 @@
public void addRuleInstances(Digester digester) {
ClassLoader cl = digester.getClassLoader();
+ digester.addRule("struts-config/set-property",
+ new BaseConfigSetPropertyRule());
+
digester.addRule("struts-config/action-mappings",
new SetActionMappingClassRule());
Modified:
struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd?rev=591730&r1=591729&r2=591730&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd
(original)
+++
struts/struts1/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_4.dtd
Sat Nov 3 19:58:55 2007
@@ -101,7 +101,7 @@
hierarchy, and contains nested elements for all of the other
configuration settings.
-->
-<!ELEMENT struts-config (display-name?, description?, form-beans?,
global-exceptions?, global-forwards?, action-mappings?, controller?,
message-resources*, plug-in*)>
+<!ELEMENT struts-config (display-name?, description?, set-property?,
form-beans?, global-exceptions?, global-forwards?, action-mappings?,
controller?, message-resources*, plug-in*)>
<!ATTLIST struts-config id ID #IMPLIED>
<!-- The "form-beans" element describes the set of form bean descriptors for
this
