martinc 2002/12/20 20:42:20
Modified: src/share/org/apache/struts/config ConfigRuleSet.java
Log:
Update to avoid the use of deprecated Digester methods. Some deprecated
methods are still used, but their replacements are not yet available in
a released version of Digester. We don't want to depend on a new Digester
release just for this, so leave them for now.
Revision Changes Path
1.14 +15 -14
jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java
Index: ConfigRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/config/ConfigRuleSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConfigRuleSet.java 7 Nov 2002 05:18:26 -0000 1.13
+++ ConfigRuleSet.java 21 Dec 2002 04:42:20 -0000 1.14
@@ -112,11 +112,11 @@
digester.addRule
("struts-config/data-sources/data-source/set-property",
- new AddDataSourcePropertyRule(digester));
+ new AddDataSourcePropertyRule());
digester.addRule
("struts-config/action-mappings",
- new SetActionMappingClassRule(digester));
+ new SetActionMappingClassRule());
digester.addFactoryCreate
("struts-config/action-mappings/action",
@@ -267,7 +267,7 @@
digester.addRule
("struts-config/plug-in/set-property",
- new PlugInSetPropertyRule(digester));
+ new PlugInSetPropertyRule());
}
@@ -282,8 +282,8 @@
final class AddDataSourcePropertyRule extends Rule {
- public AddDataSourcePropertyRule(Digester digester) {
- super(digester);
+ public AddDataSourcePropertyRule() {
+ super();
}
public void begin(Attributes attributes) throws Exception {
@@ -302,8 +302,8 @@
final class PlugInSetPropertyRule extends Rule {
- public PlugInSetPropertyRule(Digester digester) {
- super(digester);
+ public PlugInSetPropertyRule() {
+ super();
}
public void begin(Attributes attributes) throws Exception {
@@ -322,8 +322,8 @@
*/
final class SetActionMappingClassRule extends Rule {
- public SetActionMappingClassRule(Digester digester) {
- super(digester);
+ public SetActionMappingClassRule() {
+ super();
}
public void begin(Attributes attributes) throws Exception {
@@ -361,7 +361,8 @@
actionMapping =
RequestUtils.applicationInstance(className);
} catch (Exception e) {
- digester.log("ActionMappingFactory.createObject: ", e);
+ digester.getLogger().error(
+ "ActionMappingFactory.createObject: ", e);
}
return actionMapping;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
