You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2013/05/26 23:21:22 UTC
svn commit: r1486478 - in /commons/proper/chain/trunk: api/
apps/cookbook-examples/ apps/example1/ apps/example2/
configuration/api/src/main/java/org/apache/commons/chain2/config/
configuration/xml/ configuration/xml/src/main/java/org/apache/commons/ch...
Author: simonetripodi
Date: Sun May 26 21:21:21 2013
New Revision: 1486478
URL: http://svn.apache.org/r1486478
Log:
CHAIN-72 - configuration façade APIs
still better separation between configuration APIs and XML implementation
configuration exception moved to configuration package
XML related classes moved in proper config.xml subpackage
configuration exception moved to the configuration package/module
registry throws a runtime exception rather than a configuration exception
trivial: updated ignore list
Added:
commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ChainConfigurationException.java
- copied, changed from r1457658, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainConfigurationException.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigCatalogRule.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigDefineRule.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRegisterRule.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRuleSet.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/XmlConfigParser.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/package-info.java
- copied, changed from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/package-info.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestChain.java
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestChain.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestCommand.java
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestCommand.java
commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/
commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config-2.xml
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml
commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config.xml
- copied, changed from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config.xml
Removed:
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/package-info.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestChain.java
commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestCommand.java
commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml
commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config.xml
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainConfigurationException.java
Modified:
commons/proper/chain/trunk/api/ (props changed)
commons/proper/chain/trunk/apps/cookbook-examples/ (props changed)
commons/proper/chain/trunk/apps/example1/ (props changed)
commons/proper/chain/trunk/apps/example2/ (props changed)
commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
commons/proper/chain/trunk/configuration/xml/ (props changed)
commons/proper/chain/trunk/configuration/xml/pom.xml
commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java
commons/proper/chain/trunk/web/pom.xml
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java
commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java
Propchange: commons/proper/chain/trunk/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 21:21:21 2013
@@ -1,2 +1,4 @@
target
.settings
+.externalToolBuilders
+maven-eclipse.xml
Propchange: commons/proper/chain/trunk/apps/cookbook-examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 21:21:21 2013
@@ -1,2 +1,4 @@
target
.settings
+.externalToolBuilders
+maven-eclipse.xml
Propchange: commons/proper/chain/trunk/apps/example1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 21:21:21 2013
@@ -1,2 +1,4 @@
target
.settings
+.externalToolBuilders
+maven-eclipse.xml
Propchange: commons/proper/chain/trunk/apps/example2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 21:21:21 2013
@@ -1,2 +1,4 @@
target
.settings
+.externalToolBuilders
+maven-eclipse.xml
Copied: commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ChainConfigurationException.java (from r1457658, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainConfigurationException.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ChainConfigurationException.java?p2=commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ChainConfigurationException.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainConfigurationException.java&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/ChainConfigurationException.java (original)
+++ commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ChainConfigurationException.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2;
+package org.apache.commons.chain2.config;
/**
* Runtime exception representing an exception that occurred during a
Modified: commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ConfigParser.java?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ConfigParser.java (original)
+++ commons/proper/chain/trunk/configuration/api/src/main/java/org/apache/commons/chain2/config/ConfigParser.java Sun May 26 21:21:21 2013
@@ -16,13 +16,10 @@
*/
package org.apache.commons.chain2.config;
-import org.apache.commons.chain2.Catalog;
-import org.apache.commons.chain2.ChainConfigurationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.net.URL;
+import org.apache.commons.chain2.Catalog;
+
/**
* <p>Facade class to abstract the functionality of parsing an arbitrary
* configuration file that defines and configures commands and command chains
@@ -32,25 +29,7 @@ import java.net.URL;
*
* @version $Id$
*/
-public class ConfigParser {
- private final Log logger = LogFactory.getLog(getClass());
-
- /**
- * Constructor for loading a configuration parser with the default settings.
- */
- public ConfigParser() {
- logger.info("ConfigParser() instantiated");
- }
-
- /**
- * Constructor for loading a configuration parser with a specified rule
- * set class.
- * @param ruleSet class name as string of the rule set
- * @param loader class loader to use to create instance of rule set class
- */
- public ConfigParser(String ruleSet, ClassLoader loader) {
- logger.info("ConfigParser(ruleSet, loader) instantiated");
- }
+public interface ConfigParser {
// --------------------------------------------------------- Public Methods
@@ -64,7 +43,6 @@ public class ConfigParser {
* @param url <code>URL</code> of the configuration document to be parsed
* @exception ChainConfigurationException if a parsing error occurs
*/
- public void parse(URL url) throws ChainConfigurationException {
- logger.info("Parsing configuration - doing nothing");
- }
+ void parse(URL url) throws ChainConfigurationException;
+
}
Propchange: commons/proper/chain/trunk/configuration/xml/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 26 21:21:21 2013
@@ -1,2 +1,4 @@
target
.settings
+.externalToolBuilders
+maven-eclipse.xml
Modified: commons/proper/chain/trunk/configuration/xml/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/pom.xml?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/pom.xml (original)
+++ commons/proper/chain/trunk/configuration/xml/pom.xml Sun May 26 21:21:21 2013
@@ -40,6 +40,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>commons-chain2-configuration-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>commons-digester3</artifactId>
</dependency>
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigCatalogRule.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigCatalogRule.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigCatalogRule.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigCatalogRule.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigDefineRule.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigDefineRule.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigDefineRule.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigDefineRule.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.digester3.Rule;
import org.xml.sax.Attributes;
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRegisterRule.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRegisterRule.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRegisterRule.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRegisterRule.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.Chain;
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRuleSet.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRuleSet.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRuleSet.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/ConfigRuleSet.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.RuleSetBase;
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/XmlConfigParser.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigParser.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/XmlConfigParser.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/XmlConfigParser.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigParser.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/ConfigParser.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/XmlConfigParser.java Sun May 26 21:21:21 2013
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
-import org.apache.commons.chain2.ChainConfigurationException;
+import org.apache.commons.chain2.config.ChainConfigurationException;
import org.apache.commons.digester3.Digester;
import org.apache.commons.digester3.RuleSet;
@@ -33,7 +33,7 @@ import java.net.URL;
*
* @version $Id: ConfigParser.java 1364104 2012-07-21 14:25:54Z elijah $
*/
-public class ConfigParser {
+public class XmlConfigParser {
// ----------------------------------------------------- Instance Variables
/**
@@ -49,10 +49,10 @@ public class ConfigParser {
// ------------------------------------------------------------- Constructor
- public ConfigParser() {
+ public XmlConfigParser() {
}
- public ConfigParser(String ruleSet, ClassLoader loader) {
+ public XmlConfigParser(String ruleSet, ClassLoader loader) {
if (ruleSet == null) {
throw new IllegalArgumentException("ConfigParser can't be " +
"instantiated with a null ruleSet class name");
Copied: commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/package-info.java (from r1486474, commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/package-info.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/package-info.java?p2=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/package-info.java&p1=commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/package-info.java&r1=1486474&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/package-info.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/main/java/org/apache/commons/chain2/config/xml/package-info.java Sun May 26 21:21:21 2013
@@ -19,4 +19,4 @@
* Optional package for configuring command chains in a catalog
* (using Digester) from an XML configuration file.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
Copied: commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java?p2=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java&p1=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParser2TestCase.java Sun May 26 21:21:21 2013
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.config.xml.ConfigRuleSet;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
import org.apache.commons.chain2.impl.*;
import org.apache.commons.digester3.Digester;
import org.junit.After;
@@ -41,7 +43,7 @@ public class ConfigParser2TestCase {
private static final String DEFAULT_XML =
- "/org/apache/commons/chain2/config/test-config-2.xml";
+ "/org/apache/commons/chain2/config/xml/test-config-2.xml";
// ------------------------------------------------------ Instance Variables
@@ -62,7 +64,7 @@ public class ConfigParser2TestCase {
/**
* <p>The <code>ConfigParser</code> instance under test.</p>
*/
- protected ConfigParser parser = null;
+ protected XmlConfigParser parser = null;
// ---------------------------------------------------- Overall Test Methods
@@ -75,7 +77,7 @@ public class ConfigParser2TestCase {
public void setUp() {
catalog = new CatalogBase<String, Object, Context<String, Object>>();
context = new ContextBase();
- parser = new ConfigParser();
+ parser = new XmlConfigParser();
}
Copied: commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java?p2=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java&p1=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/ConfigParserTestCase.java Sun May 26 21:21:21 2013
@@ -15,11 +15,13 @@
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.config.xml.ConfigRuleSet;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
import org.apache.commons.chain2.impl.*;
import org.apache.commons.digester3.Digester;
import org.junit.After;
@@ -40,7 +42,7 @@ public class ConfigParserTestCase {
private static final String DEFAULT_XML =
- "/org/apache/commons/chain2/config/test-config.xml";
+ "/org/apache/commons/chain2/config/xml/test-config.xml";
// ------------------------------------------------------ Instance Variables
@@ -61,7 +63,7 @@ public class ConfigParserTestCase {
/**
* <p>The <code>ConfigParser</code> instance under test.</p>
*/
- protected ConfigParser parser = null;
+ protected XmlConfigParser parser = null;
// ---------------------------------------------------- Overall Test Methods
@@ -75,7 +77,7 @@ public class ConfigParserTestCase {
CatalogFactory.clear();
catalog = new CatalogBase<String, Object, Context<String, Object>>();
context = new ContextBase();
- parser = new ConfigParser();
+ parser = new XmlConfigParser();
}
Copied: commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestChain.java (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestChain.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestChain.java?p2=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestChain.java&p1=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestChain.java&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestChain.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestChain.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Context;
Copied: commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestCommand.java (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestCommand.java?p2=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestCommand.java&p1=commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestCommand.java&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/TestCommand.java (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/java/org/apache/commons/chain2/config/xml/TestCommand.java Sun May 26 21:21:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain2.config;
+package org.apache.commons.chain2.config.xml;
import org.apache.commons.chain2.Command;
Copied: commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config-2.xml (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config-2.xml?p2=commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config-2.xml&p1=commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config-2.xml Sun May 26 21:21:21 2013
@@ -32,9 +32,9 @@
<define name="non-delegating-filter"
className="org.apache.commons.chain2.impl.NonDelegatingFilter"/>
<define name="test-chain"
- className="org.apache.commons.chain2.config.TestChain"/>
+ className="org.apache.commons.chain2.config.xml.TestChain"/>
<define name="test-command"
- className="org.apache.commons.chain2.config.TestCommand"/>
+ className="org.apache.commons.chain2.config.xml.TestCommand"/>
<!-- Single command "chains" from CatalogBaseTestCase -->
<adding-command
Copied: commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config.xml (from r1457658, commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config.xml)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config.xml?p2=commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config.xml&p1=commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config.xml&r1=1457658&r2=1486478&rev=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/test-config.xml (original)
+++ commons/proper/chain/trunk/configuration/xml/src/test/resources/org/apache/commons/chain2/config/xml/test-config.xml Sun May 26 21:21:21 2013
@@ -32,11 +32,11 @@
<command name="NonDelegatingFilter"
className="org.apache.commons.chain2.impl.NonDelegatingFilter"/>
<chain name="ChainBase"
- className="org.apache.commons.chain2.config.TestChain"/>
+ className="org.apache.commons.chain2.config.xml.TestChain"/>
<!-- Configurable command with settable properties -->
<command name="Configurable"
- className="org.apache.commons.chain2.config.TestCommand"
+ className="org.apache.commons.chain2.config.xml.TestCommand"
foo="Foo Value"
bar="Bar Value"/>
Modified: commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java (original)
+++ commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/CatalogFactory.java Sun May 26 21:21:21 2013
@@ -16,14 +16,14 @@
*/
package org.apache.commons.chain2;
-import org.apache.commons.chain2.impl.CatalogFactoryBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* <p>A {@link CatalogFactory} is a class used to store and retrieve
* {@link Catalog}s. The factory allows for a default {@link Catalog}
@@ -237,7 +237,7 @@ public abstract class CatalogFactory<K,
String msg = "Couldn't not find a configuration implementation. " +
"Load a chain configuration module such as xml-configuration " +
"into the classpath and try again.";
- throw new ChainConfigurationException(msg, e);
+ throw new RuntimeException(msg, e);
}
}
}
Modified: commons/proper/chain/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/pom.xml?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/pom.xml (original)
+++ commons/proper/chain/trunk/web/pom.xml Sun May 26 21:21:21 2013
@@ -54,14 +54,12 @@
<groupId>${project.groupId}</groupId>
<artifactId>commons-chain2-configuration-api</artifactId>
<version>${project.parent.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>commons-chain2-xml-configuration</artifactId>
<version>${project.parent.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainListener.java Sun May 26 21:21:21 2013
@@ -16,22 +16,24 @@
*/
package org.apache.commons.chain2.web;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
import org.apache.commons.chain2.Catalog;
import org.apache.commons.chain2.CatalogFactory;
-import org.apache.commons.chain2.config.ConfigParser;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
import org.apache.commons.chain2.impl.CatalogBase;
import org.apache.commons.chain2.web.servlet.ServletWebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* <p><code>ServletContextListener</code> that automatically
* scans chain configuration files in the current web application at
@@ -123,7 +125,7 @@ public class ChainListener implements Se
/**
* <p>The name of the context init parameter containing the fully
* qualified class name of the <code>RuleSet</code> implementation
- * for configuring our {@link ConfigParser}.</p>
+ * for configuring our {@link XmlConfigParser}.</p>
*/
public static final String RULE_SET =
"org.apache.commons.chain2.RULE_SET";
@@ -185,8 +187,8 @@ public class ChainListener implements Se
this.getClass().getClassLoader() :
Thread.currentThread().getContextClassLoader();
- ConfigParser parser = ruleSet == null ?
- new ConfigParser() : new ConfigParser(ruleSet, cl);
+ XmlConfigParser parser = ruleSet == null ?
+ new XmlConfigParser() : new XmlConfigParser(ruleSet, cl);
// Parse the resources specified in our init parameters (if any)
if (attr == null) {
@@ -216,10 +218,10 @@ public class ChainListener implements Se
* subdirectory (if any).</p>
*
* @param context <code>ServletContext</code> for this web application
- * @param parser {@link ConfigParser} to use for parsing
+ * @param parser {@link XmlConfigParser} to use for parsing
*/
private void parseJarResources(ServletContext context,
- ConfigParser parser, Log log) {
+ XmlConfigParser parser, Log log) {
@SuppressWarnings( "unchecked" ) // it is known that always returns String inside
Set<String> jars = context.getResourcePaths("/WEB-INF/lib");
if (jars == null) {
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainResources.java Sun May 26 21:21:21 2013
@@ -17,7 +17,7 @@
package org.apache.commons.chain2.web;
import org.apache.commons.chain2.Catalog;
-import org.apache.commons.chain2.config.ConfigParser;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -48,10 +48,10 @@ final class ChainResources {
* <p>Parse the specified class loader resources.</p>
*
* @param resources Comma-delimited list of resources (or <code>null</code>)
- * @param parser {@link ConfigParser} to use for parsing
+ * @param parser {@link XmlConfigParser} to use for parsing
*/
static void parseClassResources(String resources,
- ConfigParser parser) {
+ XmlConfigParser parser) {
if (resources == null) {
return;
}
@@ -88,11 +88,11 @@ final class ChainResources {
*
* @param context <code>ServletContext</code> for this web application
* @param resources Comma-delimited list of resources (or <code>null</code>)
- * @param parser {@link ConfigParser} to use for parsing
+ * @param parser {@link XmlConfigParser} to use for parsing
*/
static void parseWebResources(ServletContext context,
String resources,
- ConfigParser parser) {
+ XmlConfigParser parser) {
if (resources == null) {
return;
}
Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java?rev=1486478&r1=1486477&r2=1486478&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/ChainServlet.java Sun May 26 21:21:21 2013
@@ -16,13 +16,7 @@
*/
package org.apache.commons.chain2.web;
-import org.apache.commons.chain2.Catalog;
-import org.apache.commons.chain2.CatalogFactory;
-import org.apache.commons.chain2.config.ConfigParser;
-import org.apache.commons.chain2.impl.CatalogBase;
-import org.apache.commons.chain2.web.servlet.ServletWebContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -30,7 +24,15 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
+import org.apache.commons.chain2.config.xml.XmlConfigParser;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* <p><code>Servlet</code> that automatically scans chain configuration files
@@ -126,7 +128,7 @@ public class ChainServlet extends HttpSe
/**
* <p>The name of the context init parameter containing the fully
* qualified class name of the <code>RuleSet</code> implementation
- * for configuring our {@link ConfigParser}.</p>
+ * for configuring our {@link XmlConfigParser}.</p>
*/
public static final String RULE_SET =
"org.apache.commons.chain2.RULE_SET";
@@ -187,8 +189,8 @@ public class ChainServlet extends HttpSe
this.getClass().getClassLoader() :
Thread.currentThread().getContextClassLoader();
- ConfigParser parser = ruleSet == null ?
- new ConfigParser() : new ConfigParser(ruleSet, cl);
+ XmlConfigParser parser = ruleSet == null ?
+ new XmlConfigParser() : new XmlConfigParser(ruleSet, cl);
// Parse the resources specified in our init parameters (if any)
if (attr == null) {