Author: echatellier Date: 2012-01-06 18:47:12 +0100 (Fri, 06 Jan 2012) New Revision: 1134 Url: http://nuiton.org/repositories/revision/eugene/1134 Log: #1869 : Update to Apache Commons Digester 3.2 Modified: trunk/eugene/pom.xml trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java trunk/pom.xml Modified: trunk/eugene/pom.xml =================================================================== --- trunk/eugene/pom.xml 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/eugene/pom.xml 2012-01-06 17:47:12 UTC (rev 1134) @@ -52,8 +52,8 @@ </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-digester3</artifactId> </dependency> <!-- JAXP parser impl for digester --> Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2012-01-06 17:47:12 UTC (rev 1134) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -23,11 +23,10 @@ * #L% */ - package org.nuiton.eugene.models.object; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.digester.Digester; +import org.apache.commons.digester3.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java 2012-01-06 17:47:12 UTC (rev 1134) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -25,8 +25,8 @@ package org.nuiton.eugene.models.object.xml; -import org.apache.commons.digester.Digester; -import org.apache.commons.digester.RuleSetBase; +import org.apache.commons.digester3.Digester; +import org.apache.commons.digester3.RuleSetBase; /** * DigesterObjectModelRuleSet @@ -61,8 +61,8 @@ } public DigesterObjectModelRuleSet(String prefix) { + super("http://www.codelutin.org/lutingenerator/objectModel"); this.prefix = prefix; - namespaceURI = "http://www.codelutin.org/lutingenerator/objectModel"; } @Override Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java 2012-01-06 17:47:12 UTC (rev 1134) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -29,7 +29,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.Enumeration; -import org.apache.commons.digester.Digester; +import org.apache.commons.digester3.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.ModelReader; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java 2012-01-06 17:47:12 UTC (rev 1134) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -25,8 +25,8 @@ package org.nuiton.eugene.models.state.xml; -import org.apache.commons.digester.Digester; -import org.apache.commons.digester.RuleSetBase; +import org.apache.commons.digester3.Digester; +import org.apache.commons.digester3.RuleSetBase; /** * StateModelDigesterRuleSet @@ -60,8 +60,8 @@ } public DigesterStateModelRuleSet(String prefix) { + super("http://www.codelutin.org/lutingenerator/stateModel"); this.prefix = prefix; - namespaceURI = "http://www.codelutin.org/lutingenerator/stateModel"; } public void addRuleInstances(Digester digester) { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-05 14:36:51 UTC (rev 1133) +++ trunk/pom.xml 2012-01-06 17:47:12 UTC (rev 1134) @@ -62,9 +62,9 @@ </dependency> <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>2.0</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-digester3</artifactId> + <version>3.2</version> <scope>compile</scope> </dependency>