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 2012/02/27 23:55:51 UTC
svn commit: r1294379 [1/3] - in /commons/proper/chain/trunk: ./
apps/example1/src/main/java/org/apache/commons/chain/apps/example/
apps/example1/src/main/webapp/WEB-INF/
apps/example2/src/main/java/org/apache/commons/chain/apps/example/
apps/example2/s...
Author: simonetripodi
Date: Mon Feb 27 22:55:46 2012
New Revision: 1294379
URL: http://svn.apache.org/viewvc?rev=1294379&view=rev
Log:
[CHAIN-65] Rename package org.apache.commons.chain to org.apache.commons.chain2 for v2 of chain - patch provided by Elijah Zupancic
Added:
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Catalog.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Catalog.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/CatalogFactory.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/CatalogFactory.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Chain.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Chain.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Command.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Command.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Context.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Context.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Filter.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Filter.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/config/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/generic/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/package-info.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainListener.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainListener.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainResources.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainResources.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainServlet.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainServlet.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/MapEntry.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/MapEntry.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/WebContext.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/WebContext.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/faces/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/package-info.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/portlet/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/
- copied from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/servlet/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/
- copied from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/
- copied from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/generic/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/
- copied from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/impl/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/ChainResourcesTestCase.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/ChainResourcesTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/MockEnumeration.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/MockEnumeration.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/MockPrincipal.java
- copied, changed from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/MockPrincipal.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/
- copied from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/portlet/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/
- copied from r1294375, commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/servlet/
commons/proper/chain/trunk/src/test/resources/org/apache/commons/chain2/
- copied from r1294375, commons/proper/chain/trunk/src/test/resources/org/apache/commons/chain/
Removed:
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Catalog.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/CatalogFactory.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Chain.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Command.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Context.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Filter.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/config/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/generic/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/impl/
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/generic/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/impl/
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/web/
commons/proper/chain/trunk/src/test/resources/org/apache/commons/chain/
Modified:
commons/proper/chain/trunk/PROPOSAL.html
commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java
commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java
commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java
commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/chain-config.xml
commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/web.xml
commons/proper/chain/trunk/build.properties.sample
commons/proper/chain/trunk/pom.xml
commons/proper/chain/trunk/sdocbook/chapter-chain.xml
commons/proper/chain/trunk/src/changes/changes.xml
commons/proper/chain/trunk/src/conf/MANIFEST.MF
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogBase.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogFactoryBase.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextBase.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/package-info.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java
commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/package-info.java
commons/proper/chain/trunk/src/site/xdoc/cookbook.xml
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestChain.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestCommand.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/AddingCommand.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogBaseTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingCommand.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingFilter.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ExceptionCommand.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ExceptionFilter.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/NonDelegatingCommand.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/NonDelegatingFilter.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/TestContext.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/TestContextTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/MockPortletContext.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/MockPortletRequest.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/MockPortletSession.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/portlet/PortletWebContextTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/ChainProcessorTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/MockHttpServletRequest.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/MockHttpServletResponse.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/MockHttpSession.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/MockServletConfig.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/MockServletContext.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommandTestCase.java
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/web/servlet/ServletWebContextTestCase.java
commons/proper/chain/trunk/src/test/resources/org/apache/commons/chain2/config/test-config-2.xml
commons/proper/chain/trunk/src/test/resources/org/apache/commons/chain2/config/test-config.xml
Modified: commons/proper/chain/trunk/PROPOSAL.html
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/PROPOSAL.html?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/PROPOSAL.html (original)
+++ commons/proper/chain/trunk/PROPOSAL.html Mon Feb 27 22:55:46 2012
@@ -89,7 +89,7 @@
<p>The fundamental API contracts of the Chain of Responsibility
pattern are encapsulated in the following interfaces in package
- <code>org.apache.commons.chain</code>:</p>
+ <code>org.apache.commons.chain2</code>:</p>
<ul>
<li><strong>Command</strong> - An individual unit of work whose
@@ -129,22 +129,22 @@
the availability of the corresponding APIs at compile time):</p>
<ul>
- <li><strong>org.apache.commons.chain.impl</strong> -
+ <li><strong>org.apache.commons.chain2.impl</strong> -
Convenience base class implementations of the fundamental API
contracts.</li>
- <li><strong>org.apache.commons.chain.generic</strong> -
+ <li><strong>org.apache.commons.chain2.generic</strong> -
Implementations of <code>Command</code> that are completely
generic across any execution environment.</li>
- <li><strong>org.apache.commons.chain.config</strong> -
+ <li><strong>org.apache.commons.chain2.config</strong> -
Implementation of XML parsing rules (via the use of Commons
Digester) so that a <code>Catalog</code> instance can be
populated with <code>Command</code> and <code>Chain</code>
instances configured from an XML document. Optional, compiled
only if commons-digester.jar is available.</li>
- <li><strong>org.apache.commons.chain.web</strong> - Abstract
+ <li><strong>org.apache.commons.chain2.web</strong> - Abstract
implementation of <code>Context</code> that represents the
fundamental characteristics of request, session, and
application scope objects in a web application environment,
@@ -153,17 +153,17 @@
identical to the "implicit variables" of the expression
language that is defined by JSTL 1.0 and JSP 2.0.</li>
- <li><strong>org.apache.commons.chain.web.faces</strong> - Concrete
+ <li><strong>org.apache.commons.chain2.web.faces</strong> - Concrete
implementation of <code>WebContext</code> for the JavaServer
Faces API. Optional, compiled only if the JavaServer Faces API
classes are available.</li>
- <li><strong>org.apache.commons.chain.web.portlet</strong> - Concrete
+ <li><strong>org.apache.commons.chain2.web.portlet</strong> - Concrete
implementation of <code>WebContext</code> for the Portlet API.
Optional, compiled only if the Portlet API classes are
available.</li>
- <li><strong>org.apache.commons.chain.web.servlet</strong> - Concrete
+ <li><strong>org.apache.commons.chain2.web.servlet</strong> - Concrete
implementation of <code>WebContext</code> for the Servlet API.
Optional, compiled only if the Servlet API classes are
available.</li>
@@ -175,7 +175,7 @@
should be maintained so that a user of commons-chain need only
provide the APIs that he or she cares about. Likewise, for
maximum reuse, command implementations should be based on the
- <code>org.apache.commons.chain.Context</code> API, rather than a
+ <code>org.apache.commons.chain2.Context</code> API, rather than a
more specialized implementation class, if at all possible.</p>
<h3>(1.5) Interaction With Other Packages</h3>
@@ -187,21 +187,21 @@
<li>Commons BeanUtils (version 1.6 or later). OPTIONAL,
required only to use the
- <code>org.apache.commons.chain.config</code> package.</li>
+ <code>org.apache.commons.chain2.config</code> package.</li>
<li>Commons Collections (version 1.0 or later). OPTIONAL,
required only to use the
- <code>org.apache.commons.chain.config</code> package.</li>
+ <code>org.apache.commons.chain2.config</code> package.</li>
<li>Commons Digester (version 1.3 or later). OPTIONAL, required
- only to use the <code>org.apache.commons.chain.config</code>
+ only to use the <code>org.apache.commons.chain2.config</code>
package.</li>
<li>Commons Logging (version 1.0.3 or later). OPTIONAL,
required only to use the
- <code>org.apache.commons.chain.config</code> package and
+ <code>org.apache.commons.chain2.config</code> package and
to build and use the
- <code>org.apache.commons.chain.web.servlet.config</code>
+ <code>org.apache.commons.chain2.web.servlet.config</code>
package.</li>
<li>JavaServer Faces API (version 1.0 or later). OPTIONAL,
Modified: commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java Mon Feb 27 22:55:46 2012
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.apps.example;
+package org.apache.commons.chain2.apps.example;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.WebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java Mon Feb 27 22:55:46 2012
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.apps.example;
+package org.apache.commons.chain2.apps.example;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
import javax.servlet.RequestDispatcher;
/**
Modified: commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml Mon Feb 27 22:55:46 2012
@@ -26,18 +26,18 @@
<!-- Command that maps "Path Info" patterns to Commands -->
<chain name="command">
- <command className="org.apache.commons.chain.web.servlet.PathInfoMapper"/>
- <command forward="/pathinfo.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command className="org.apache.commons.chain2.web.servlet.PathInfoMapper"/>
+ <command forward="/pathinfo.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="/foo">
- <command attribute="pathinfoFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="pathinfoFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="/bar">
- <command attribute="pathinfoBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="pathinfoBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
</catalog>
@@ -47,18 +47,18 @@
<!-- Command that maps a "Request Parameter" to Commands -->
<chain name="command">
- <command catalogName="reqparam" className="org.apache.commons.chain.web.servlet.RequestParameterMapper"/>
- <command forward="/reqparam.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command catalogName="reqparam" className="org.apache.commons.chain2.web.servlet.RequestParameterMapper"/>
+ <command forward="/reqparam.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="foo">
- <command attribute="reqparamFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="reqparamFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="bar">
- <command attribute="reqparamBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="reqparamBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
</catalog>
@@ -68,18 +68,18 @@
<!-- Command that maps "Servlet Path" patterns to Commands -->
<chain name="command">
- <command catalogName="servletpath" className="org.apache.commons.chain.web.servlet.ServletPathMapper"/>
- <command forward="/servletpath.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command catalogName="servletpath" className="org.apache.commons.chain2.web.servlet.ServletPathMapper"/>
+ <command forward="/servletpath.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="/foo.execute">
- <command attribute="servletpathFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="servletpathFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="/bar.execute">
- <command attribute="servletpathBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="servletpathBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
Modified: commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml (original)
+++ commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml Mon Feb 27 22:55:46 2012
@@ -22,26 +22,26 @@
<display-name>Chain Example</display-name>
<context-param>
- <param-name>org.apache.commons.chain.CONFIG_WEB_RESOURCE</param-name>
+ <param-name>org.apache.commons.chain2.CONFIG_WEB_RESOURCE</param-name>
<param-value>/WEB-INF/chain-config.xml</param-value>
</context-param>
<!-- "Path Info" Servlet Configuration (uses default catalog) -->
<servlet>
<servlet-name>pathinfo</servlet-name>
- <servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
+ <servlet-class>org.apache.commons.chain2.web.servlet.ChainProcessor</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- "Request Parameter" Servlet Configuration -->
<servlet>
<servlet-name>reqparam</servlet-name>
- <servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
+ <servlet-class>org.apache.commons.chain2.web.servlet.ChainProcessor</servlet-class>
<load-on-startup>2</load-on-startup>
<!-- Configure catalog name -->
<init-param>
- <param-name>org.apache.commons.chain.CATALOG</param-name>
+ <param-name>org.apache.commons.chain2.CATALOG</param-name>
<param-value>reqparam</param-value>
</init-param>
@@ -50,12 +50,12 @@
<!-- "Servlet Path" Servlet Configuration -->
<servlet>
<servlet-name>servletpath</servlet-name>
- <servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
+ <servlet-class>org.apache.commons.chain2.web.servlet.ChainProcessor</servlet-class>
<load-on-startup>3</load-on-startup>
<!-- Configure catalog name -->
<init-param>
- <param-name>org.apache.commons.chain.CATALOG</param-name>
+ <param-name>org.apache.commons.chain2.CATALOG</param-name>
<param-value>servletpath</param-value>
</init-param>
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/CountCommand.java Mon Feb 27 22:55:46 2012
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.apps.example;
+package org.apache.commons.chain2.apps.example;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.WebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java Mon Feb 27 22:55:46 2012
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.apps.example;
+package org.apache.commons.chain2.apps.example;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/java/org/apache/commons/chain/apps/example/ForwardCommand.java Mon Feb 27 22:55:46 2012
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.apps.example;
+package org.apache.commons.chain2.apps.example;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
import javax.servlet.RequestDispatcher;
/**
Modified: commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/chain-config.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/chain-config.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/chain-config.xml (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/chain-config.xml Mon Feb 27 22:55:46 2012
@@ -26,18 +26,18 @@
<!-- Command that maps "Path Info" patterns to Commands -->
<chain name="COMMAND_MAPPER">
- <command className="org.apache.commons.chain.web.servlet.PathInfoMapper"/>
- <command forward="/pathinfo.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command className="org.apache.commons.chain2.web.servlet.PathInfoMapper"/>
+ <command forward="/pathinfo.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="/foo">
- <command attribute="pathinfoFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="pathinfoFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="/bar">
- <command attribute="pathinfoBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="pathinfoBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
</catalog>
@@ -47,18 +47,18 @@
<!-- Command that maps a "Request Parameter" to Commands -->
<chain name="COMMAND_MAPPER">
- <command catalogName="reqparam" className="org.apache.commons.chain.web.servlet.RequestParameterMapper"/>
- <command forward="/reqparam.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command catalogName="reqparam" className="org.apache.commons.chain2.web.servlet.RequestParameterMapper"/>
+ <command forward="/reqparam.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="foo">
- <command attribute="reqparamFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="reqparamFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="bar">
- <command attribute="reqparamBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="reqparamBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
</catalog>
@@ -68,18 +68,18 @@
<!-- Command that maps "Servlet Path" patterns to Commands -->
<chain name="COMMAND_MAPPER">
- <command catalogName="servletpath" className="org.apache.commons.chain.web.servlet.ServletPathMapper"/>
- <command forward="/servletpath.jsp" className="org.apache.commons.chain.apps.example.ForwardCommand"/>
+ <command catalogName="servletpath" className="org.apache.commons.chain2.web.servlet.ServletPathMapper"/>
+ <command forward="/servletpath.jsp" className="org.apache.commons.chain2.apps.example.ForwardCommand"/>
</chain>
<!-- Foo Command -->
<chain name="/foo.execute">
- <command attribute="servletpathFooCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="servletpathFooCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
<!-- Bar Command -->
<chain name="/bar.execute">
- <command attribute="servletpathBarCount" className="org.apache.commons.chain.apps.example.CountCommand"/>
+ <command attribute="servletpathBarCount" className="org.apache.commons.chain2.apps.example.CountCommand"/>
</chain>
Modified: commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/web.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/web.xml (original)
+++ commons/proper/chain/trunk/apps/example2/src/main/webapp/WEB-INF/web.xml Mon Feb 27 22:55:46 2012
@@ -22,35 +22,35 @@
<display-name>Chain Example</display-name>
<context-param>
- <param-name>org.apache.commons.chain.CONFIG_WEB_RESOURCE</param-name>
+ <param-name>org.apache.commons.chain2.CONFIG_WEB_RESOURCE</param-name>
<param-value>/WEB-INF/chain-config.xml</param-value>
</context-param>
<!-- Configuration Listener -->
<listener>
<listener-class>
- org.apache.commons.chain.web.ChainListener
+ org.apache.commons.chain2.web.ChainListener
</listener-class>
</listener>
<!-- "Path Info" Servlet Configuration -->
<servlet>
<servlet-name>pathinfo</servlet-name>
- <servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+ <servlet-class>org.apache.commons.chain2.apps.example.ExampleServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- "Request Parameter" Servlet Configuration -->
<servlet>
<servlet-name>reqparam</servlet-name>
- <servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+ <servlet-class>org.apache.commons.chain2.apps.example.ExampleServlet</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
<!-- "Servlet Path" Servlet Configuration -->
<servlet>
<servlet-name>servletpath</servlet-name>
- <servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+ <servlet-class>org.apache.commons.chain2.apps.example.ExampleServlet</servlet-class>
<load-on-startup>3</load-on-startup>
</servlet>
Modified: commons/proper/chain/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/build.properties.sample?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/build.properties.sample (original)
+++ commons/proper/chain/trunk/build.properties.sample Mon Feb 27 22:55:46 2012
@@ -34,17 +34,17 @@ portlet-api.jar=../../jakarta-jetspeed-2
servlet-api.jar = /usr/local/jwsdp-1.2/common/lib/servlet-api.jar
# (OPTIONAL) The pathname of the "commons-beanutils.jar" file
-# required only if you are using the org.apache.commons.chain.config package
+# required only if you are using the org.apache.commons.chain2.config package
# To disable, set to a non-existant path (e.g. /absent.jar)
commons-beanutils.jar = ../../jakarta-commons/beanutils/dist/commons-beanutils.jar
# (OPTIONAL) The pathname of the "commons-collections.jar" file
-# required only if you are using the org.apache.commons.chain.config package
+# required only if you are using the org.apache.commons.chain2.config package
# To disable, set to a non-existant path (e.g. /absent.jar)
commons-collections.jar = ../../jakarta-commons/collections/dist/commons-collections.jar
# (OPTIONAL) The pathname of the "commons-digester.jar" file
-# required only if you are using the org.apache.commons.chain.config package
+# required only if you are using the org.apache.commons.chain2.config package
# To disable, set to a non-existant path (e.g. /absent.jar)
commons-digester.jar = ../../jakarta-commons/digester/dist/commons-digester.jar
Modified: commons/proper/chain/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Mon Feb 27 22:55:46 2012
@@ -24,8 +24,8 @@
<version>23</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
+ <groupId>org.apache.commons.chain</groupId>
+ <artifactId>commons-chain2</artifactId>
<version>2.0-SNAPSHOT</version>
<name>Commons Chain</name>
<description>
Modified: commons/proper/chain/trunk/sdocbook/chapter-chain.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/sdocbook/chapter-chain.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/sdocbook/chapter-chain.xml (original)
+++ commons/proper/chain/trunk/sdocbook/chapter-chain.xml Mon Feb 27 22:55:46 2012
@@ -274,11 +274,11 @@
<programlisting>package org.apache.commons.mailreader;
import junit.framework.TestCase;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.mailreader.commands.ProfileCheck;
-import org.apache.commons.chain.mailreader.commands.Profile;
-import org.apache.commons.chain.impl.ContextBase;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.mailreader.commands.ProfileCheck;
+import org.apache.commons.chain2.mailreader.commands.Profile;
+import org.apache.commons.chain2.impl.ContextBase;
public class ProfileCheckTest extends TestCase {
@@ -359,10 +359,10 @@ public class ProfileCheckTest extends Te
<example>
<title>A Command to create a Profile, if one doesn't exist.</title>
- <programlisting>package org.apache.commons.chain.mailreader.commands;
+ <programlisting>package org.apache.commons.chain2.mailreader.commands;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
public class ProfileCheck implements Command {
@@ -386,7 +386,7 @@ public class ProfileCheck implements Com
<example>
<title>The simplest Profile class that can possibly work.</title>
- <programlisting>package org.apache.commons.chain.mailreader.commands;
+ <programlisting>package org.apache.commons.chain2.mailreader.commands;
public class Profile {
public static String PROFILE_KEY = "profile";
}</programlisting>
@@ -547,7 +547,7 @@ public class Profile {
<para><programlisting>package org.apache.commons.mailreader;
import junit.framework.TestCase;
import junit.framework.Assert;
-import org.apache.commons.chain.mailreader.MailReader;
+import org.apache.commons.chain2.mailreader.MailReader;
import java.util.Locale;
public class LocaleValueTest extends TestCase {
@@ -589,8 +589,8 @@ public class LocaleValueTest extends Tes
<title>The simplest MailReader object that will pass
LocalValueTest.</title>
- <para><programlisting>package org.apache.commons.chain.mailreader;
-import org.apache.commons.chain.impl.ContextBase;
+ <para><programlisting>package org.apache.commons.chain2.mailreader;
+import org.apache.commons.chain2.impl.ContextBase;
import java.util.Locale;
public class MailReader extends ContextBase {Prop
@@ -614,8 +614,8 @@ public class MailReader extends ContextB
<title>An even simpler MailReader Context (but that would fail
LocalValueTest).</title>
- <para><programlisting>package org.apache.commons.chain.mailreader;
-import org.apache.commons.chain.Context;
+ <para><programlisting>package org.apache.commons.chain2.mailreader;
+import org.apache.commons.chain2.Context;
import java.util.Hashmap;
public class MailReader extends Hashmap implements Context {
@@ -697,10 +697,10 @@ public class MailReader extends Hashmap
<chains>
<command
name="LocaleChange"
- className="org.apache.commons.chain.mailreader.commands.LocaleChange"/>
+ className="org.apache.commons.chain2.mailreader.commands.LocaleChange"/>
<command
name="LogonUser"
- className="org.apache.commons.chain.mailreader.commands.LogonUser"/>
+ className="org.apache.commons.chain2.mailreader.commands.LogonUser"/>
</chains></programlisting></para>
</example>The application needs to know the name given to a Command we
want to execute, but it does not need to know the classname of the
@@ -718,13 +718,13 @@ public class MailReader extends Hashmap
<para><programlisting><chains>
<chain name="LocaleChange">
<command
- className="org.apache.commons.chain.mailreader.commands.ProfileCheck"/>
+ className="org.apache.commons.chain2.mailreader.commands.ProfileCheck"/>
<command
- className="org.apache.commons.chain.mailreader.commands.LocaleChange"/>
+ className="org.apache.commons.chain2.mailreader.commands.LocaleChange"/>
</chain>
<command
name="LogonUser"
- className="org.apache.commons.chain.mailreader.commands.LogonUser"/>
+ className="org.apache.commons.chain2.mailreader.commands.LogonUser"/>
</chains></programlisting></para>
</example></para>
@@ -766,11 +766,11 @@ public class MailReader extends Hashmap
<programlisting> <!-- Commons Chain listener to load catalogs -->
<context-param>
- <param-name>org.apache.commons.chain.CONFIG_CLASS_RESOURCE</param-name>
+ <param-name>org.apache.commons.chain2.CONFIG_CLASS_RESOURCE</param-name>
<param-value>resources/catalog.xml</param-value>
</context-param>
<listener>
- <listener-class>org.apache.commons.chain.web.ChainListener</listener-class>
+ <listener-class>org.apache.commons.chain2.web.ChainListener</listener-class>
</listener></programlisting>
</example>The elements in Example 11 expect that there is a
"catalog.xml" file stored on the application's classpath under a directory
@@ -921,7 +921,7 @@ public class MailReader extends Hashmap
<chains>
<command
name="<emphasis>LocaleChange</emphasis>"
- className="org.apache.commons.chain.mailreader.commands.LocaleChange" />
+ className="org.apache.commons.chain2.mailreader.commands.LocaleChange" />
</chains>
<!-- validation.xml -->
@@ -956,7 +956,7 @@ public class MailReader extends Hashmap
<action-mappings>
<action path="/LocaleChange"
name="<emphasis>LocaleChange</emphasis>"
- type="org.apache.commons.chain.mailreader.struts.CommandAction">
+ type="org.apache.commons.chain2.mailreader.struts.CommandAction">
<forward name="success" path="/Welcome.do" />
</action>
</action-mappings>
@@ -969,11 +969,11 @@ public class MailReader extends Hashmap
<title>The CommandAction links the form-bean name with the Command
name</title>
- <para><programlisting>package org.apache.commons.chain.mailreader.struts;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.servlet.ServletWebContext;
+ <para><programlisting>package org.apache.commons.chain2.mailreader.struts;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;as the ActionForm name.
@@ -1302,8 +1302,8 @@ import org.apache.commons.agility.Proces
import org.apache.commons.agility.Request;
import org.apache.commons.agility.RequestHandler;
import org.apache.commons.agility.Response;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
public class HandlerCommand implements Command, RequestHandler {
String name = null;
@@ -1360,7 +1360,7 @@ public class HandlerCommand implements C
<para><programlisting>package org.apache.commons.agility.impl;
import org.apache.commons.agility.Response;
-import org.apache.commons.chain.impl.ContextBase;
+import org.apache.commons.chain2.impl.ContextBase;
public class ResponseContext extends ContextBase implements Response {
@@ -1394,8 +1394,8 @@ import org.apache.commons.agility.Contro
import org.apache.commons.agility.ProcessException;
import org.apache.commons.agility.Request;
import org.apache.commons.agility.RequestHandler;
-import org.apache.commons.chain.impl.CatalogBase;
-import org.apache.commons.chain.Command;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.Command;
public class ControllerCatalog extends CatalogBase implements Controller {
public RequestHandler getHandler(String name) {
@@ -1441,7 +1441,7 @@ public class ControllerCatalog extends C
import org.apache.commons.agility.Request;
import org.apache.commons.agility.Response;
-import org.apache.commons.chain.impl.ContextBase;
+import org.apache.commons.chain2.impl.ContextBase;
public class RequestContext extends ContextBase implements Request {
Modified: commons/proper/chain/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/changes/changes.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/changes/changes.xml (original)
+++ commons/proper/chain/trunk/src/changes/changes.xml Mon Feb 27 22:55:46 2012
@@ -40,6 +40,9 @@ The <action> type attribute can be add,u
<body>
<release version="2.0" description="Major release">
+ <action dev="simonetripodi" type="add" issue="CHAIN-65" due-to="Elijah Zupancic">
+ Rename package org.apache.commons.chain to org.apache.commons.chain2 for v2 of chain.
+ </action>
<action dev="simonetripodi" type="add" issue="CHAIN-61" due-to="Elijah Zupancic">
Chain 2.0 trunk build is throwing many warnings as a result of generification changes.
</action>
Modified: commons/proper/chain/trunk/src/conf/MANIFEST.MF
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/conf/MANIFEST.MF?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/conf/MANIFEST.MF (original)
+++ commons/proper/chain/trunk/src/conf/MANIFEST.MF Mon Feb 27 22:55:46 2012
@@ -2,6 +2,6 @@ Extension-Name: @package@
Specification-Title: Jakarta Commons Chain
Specification-Vendor: Apache Software Foundation
Specification-Version: 1.0
-Implementation-Title: org.apache.commons.chain
+Implementation-Title: org.apache.commons.chain2
Implementation-Vendor: Apache Software Foundation
Implementation-Version: @version@
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Catalog.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Catalog.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Catalog.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Catalog.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Catalog.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Catalog.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Catalog.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.Iterator;
@@ -43,7 +43,7 @@ public interface Catalog<K, V, C extends
* <p>A default context attribute for storing a default {@link Catalog},
* provided as a convenience only.</p>
*/
- String CATALOG_KEY = "org.apache.commons.chain.CATALOG";
+ String CATALOG_KEY = "org.apache.commons.chain2.CATALOG";
/**
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/CatalogFactory.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/CatalogFactory.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/CatalogFactory.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/CatalogFactory.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/CatalogFactory.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/CatalogFactory.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/CatalogFactory.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.chain.impl.CatalogFactoryBase;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Chain.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Chain.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Chain.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Chain.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Chain.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Chain.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Chain.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.Map;
@@ -36,7 +36,7 @@ import java.util.Map;
*
* <p>To protect applications from evolution of this interface, specialized
* implementations of {@link Chain} should generally be created by extending
- * the provided base class {@link org.apache.commons.chain.impl.ChainBase})
+ * the provided base class {@link org.apache.commons.chain2.impl.ChainBase})
* rather than directly implementing this interface.</p>
*
* <p>{@link Chain} implementations should be designed in a thread-safe
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Command.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Command.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Command.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Command.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Command.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Command.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Command.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.Map;
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Context.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Context.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Context.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Context.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Context.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Context.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Context.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.Map;
@@ -47,7 +47,7 @@ import java.util.Map;
*
* <p>To protect applications from evolution of this interface, specialized
* implementations of {@link Context} should generally be created by extending
- * the provided base class ({@link org.apache.commons.chain.impl.ContextBase})
+ * the provided base class ({@link org.apache.commons.chain2.impl.ContextBase})
* rather than directly implementing this interface.</p>
*
* <p>Applications should <strong>NOT</strong> assume that
Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Filter.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Filter.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Filter.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Filter.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Filter.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/Filter.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/Filter.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain;
+package org.apache.commons.chain2;
import java.util.Map;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigCatalogRule.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
import java.util.Map;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
import org.apache.commons.digester.Rule;
import org.xml.sax.Attributes;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigDefineRule.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
import org.apache.commons.digester.Rule;
@@ -24,8 +24,8 @@ import org.xml.sax.Attributes;
/**
* <p>Digester rule that will dynamically register a new set of rules
* for a specified element name and default implementation class. This
- * allows "alias" elements to be created for {@link org.apache.commons.chain.Chain}
- * and {@link org.apache.commons.chain.Command}
+ * allows "alias" elements to be created for {@link org.apache.commons.chain2.Chain}
+ * and {@link org.apache.commons.chain2.Command}
* implementation classes that are commonly used. Besides factoring out
* the class names to make changes easier, this also makes configuration
* files <strong>much</strong> easier to read and write.</p>
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigParser.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigParser.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigParser.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigParser.java Mon Feb 27 22:55:46 2012
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
import java.net.URL;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Context;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Context;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.RuleSet;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRegisterRule.java Mon Feb 27 22:55:46 2012
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
import java.util.Map;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Chain;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Chain;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
import org.apache.commons.digester.Rule;
import org.xml.sax.Attributes;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/ConfigRuleSet.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
import org.apache.commons.digester.Digester;
@@ -24,49 +24,49 @@ import org.apache.commons.digester.RuleS
/**
* <p>Digester <code>RuleSet</code> for configuring <em>Chain of
* Responsibility</em> command chains, and adding them to an appropriate
- * {@link org.apache.commons.chain.Catalog}. The following properties
+ * {@link org.apache.commons.chain2.Catalog}. The following properties
* may be configured prior to executing the <code>addRuleInstance()</code>
* method in order to influence the rules that get added, with default
* values in square brackets:</p>
* <ul>
* <li><strong>catalogClass</strong> -- Fully qualified name of the
* implementation class used to create new
- * {@link org.apache.commons.chain.Catalog} instances.
+ * {@link org.apache.commons.chain2.Catalog} instances.
* If not specified, the default value is
- * <code>org.apache.commons.chain.impl.CatalogBsae</code>.</li>
+ * <code>org.apache.commons.chain2.impl.CatalogBsae</code>.</li>
* <li><strong>catalogElement</strong> -- Name of the XML element representing
- * the addition of a {@link org.apache.commons.chain.Catalog}.
+ * the addition of a {@link org.apache.commons.chain2.Catalog}.
* Any such catalog that is created will be registered with the
- * {@link org.apache.commons.chain.CatalogFactory} instance for our
+ * {@link org.apache.commons.chain2.CatalogFactory} instance for our
* application, under the name specified by the <code>nameAttribute</code>
- * attribute (if present), or as the default {@link org.apache.commons.chain.Catalog}.
+ * attribute (if present), or as the default {@link org.apache.commons.chain2.Catalog}.
* If not specified, the default value is <code>catalog</code>.</li>
* <li><strong>chainClass</strong> -- Fully qualified name of the implementation
- * class used to create new {@link org.apache.commons.chain.Chain} instances.
+ * class used to create new {@link org.apache.commons.chain2.Chain} instances.
* If not specified, the default value is
- * <code>org.apache.commons.chain.impl.ChainBase</code>.
+ * <code>org.apache.commons.chain2.impl.ChainBase</code>.
* </li>
* <li><strong>chainElement</strong> -- Name of the XML element representing
- * the addition of a {@link org.apache.commons.chain.Chain}. A chain
+ * the addition of a {@link org.apache.commons.chain2.Chain}. A chain
* element has the same functionality as a command element, except that
* it defaults the implementation class to
- * <code>org.apache.commons.chain.impl.ChainBase</code>. [chain]</li>
+ * <code>org.apache.commons.chain2.impl.ChainBase</code>. [chain]</li>
* <li><strong>classAttribute</strong> -- Attribute on a chain (optional) or
* command (required) element that specifies the fully qualified class
* name of the implementation class that should be instantiated.
* [className]</li>
* <li><strong>commandElement</strong> -- Name of the XML element
- * representing the addition of a {@link org.apache.commons.chain.Command}.
+ * representing the addition of a {@link org.apache.commons.chain2.Command}.
* An implementation class name must be provided on the attribute named by the
* <code>classAttribute</code> property. [command]</li>
* <li><strong>defineElement</strong> -- Name of the XML element
* that associates the element specified by the <code>nameAttribute</code>
- * attributes with a {@link org.apache.commons.chain.Command} or
- * {@link org.apache.commons.chain.Chain} implementation class
+ * attributes with a {@link org.apache.commons.chain2.Command} or
+ * {@link org.apache.commons.chain2.Chain} implementation class
* named by the <code>classAttribute</code> attribute. [define]</li>
* <li><strong>nameAttribute</strong> -- Attribute on an outermost chain or
* command element that will be used to register this command with the
- * associated {@link org.apache.commons.chain.Catalog} instance on the stack.
+ * associated {@link org.apache.commons.chain2.Catalog} instance on the stack.
* [name]</li>
* <li><strong>namespaceURI</strong> -- The XML namespace URI with which these
* rules will be associated, or <code>null</code> for no namespace.
@@ -83,9 +83,9 @@ public class ConfigRuleSet extends RuleS
// ----------------------------------------------------- Instance Variables
- private String catalogClass = "org.apache.commons.chain.impl.CatalogBase";
+ private String catalogClass = "org.apache.commons.chain2.impl.CatalogBase";
private String catalogElement = "catalog";
- private String chainClass = "org.apache.commons.chain.impl.ChainBase";
+ private String chainClass = "org.apache.commons.chain2.impl.ChainBase";
private String chainElement = "chain";
private String classAttribute = "className";
private String commandElement = "command";
@@ -97,7 +97,7 @@ public class ConfigRuleSet extends RuleS
/**
- * <p>Return the fully qualified {@link org.apache.commons.chain.Catalog}
+ * <p>Return the fully qualified {@link org.apache.commons.chain2.Catalog}
* implementation class.</p>
* @return The Catalog's class name.
*/
@@ -107,10 +107,10 @@ public class ConfigRuleSet extends RuleS
/**
- * <p>Set the fully qualified {@link org.apache.commons.chain.Catalog}
+ * <p>Set the fully qualified {@link org.apache.commons.chain2.Catalog}
* implementation class.</p>
*
- * @param catalogClass The new {@link org.apache.commons.chain.Catalog}
+ * @param catalogClass The new {@link org.apache.commons.chain2.Catalog}
* implementation class
*/
public void setCatalogClass(String catalogClass) {
@@ -138,7 +138,7 @@ public class ConfigRuleSet extends RuleS
/**
- * <p>Return the fully qualified {@link org.apache.commons.chain.Chain}
+ * <p>Return the fully qualified {@link org.apache.commons.chain2.Chain}
* implementation class.</p>
* @return The Chain's class name.
*/
@@ -148,10 +148,10 @@ public class ConfigRuleSet extends RuleS
/**
- * <p>Set the fully qualified {@link org.apache.commons.chain.Chain}
+ * <p>Set the fully qualified {@link org.apache.commons.chain2.Chain}
* implementation class.</p>
*
- * @param chainClass The new {@link org.apache.commons.chain.Chain}
+ * @param chainClass The new {@link org.apache.commons.chain2.Chain}
* implementation class
*/
public void setChainClass(String chainClass) {
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/config/package-info.java Mon Feb 27 22:55:46 2012
@@ -19,4 +19,4 @@
* Optional package for configuring command chains in a catalog
* (using Digester) from an XML configuration file.
*/
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
import java.util.Map;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
/**
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java Mon Feb 27 22:55:46 2012
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java Mon Feb 27 22:55:46 2012
@@ -14,21 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Filter;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.Filter;
+
import java.lang.reflect.Method;
import java.util.WeakHashMap;
/**
* <p>This command combines elements of the {@link LookupCommand} with the
* {@link DispatchCommand}. Look up a specified {@link Command} (which could
- * also be a {@link org.apache.commons.chain.Chain}) in a
- * {@link org.apache.commons.chain.Catalog}, and delegate execution to
+ * also be a {@link org.apache.commons.chain2.Chain}) in a
+ * {@link org.apache.commons.chain2.Catalog}, and delegate execution to
* it. Introspection is used to lookup the appropriate method to delegate
* execution to. If the delegated-to {@link Command} is also a
* {@link Filter}, its <code>postprocess()</code> method will also be invoked
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java Mon Feb 27 22:55:46 2012
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
import java.util.Map;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Filter;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.Filter;
/**
* <p>Look up a specified {@link Command} (which could also be a
- * {@link org.apache.commons.chain.Chain})
+ * {@link org.apache.commons.chain2.Chain})
* in a {@link Catalog}, and delegate execution to it. If the delegated-to
* {@link Command} is also a {@link Filter}, its <code>postprocess()</code>
* method will also be invoked at the appropriate time.</p>
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java Mon Feb 27 22:55:46 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
/**
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/generic/package-info.java Mon Feb 27 22:55:46 2012
@@ -19,4 +19,4 @@
* Concrete implementations of generic Commands that are useful in many
* different environments, not tied to a particular tier such as Servlets).
*/
-package org.apache.commons.chain.generic;
+package org.apache.commons.chain2.generic;
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogBase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogBase.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogBase.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;
import static java.util.Collections.unmodifiableMap;
@@ -22,8 +22,8 @@ import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Command;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
/**
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogFactoryBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogFactoryBase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogFactoryBase.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/CatalogFactoryBase.java Mon Feb 27 22:55:46 2012
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
/**
* <p>A simple implementation of {@link CatalogFactory}.</p>
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ChainBase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ChainBase.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ChainBase.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;
import java.util.ArrayList;
@@ -22,10 +22,10 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import org.apache.commons.chain.Chain;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Filter;
+import org.apache.commons.chain2.Chain;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.Filter;
/**
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextBase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextBase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextBase.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextBase.java Mon Feb 27 22:55:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;
import java.beans.IntrospectionException;
@@ -30,7 +30,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Context;
/**
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/ContextMap.java Mon Feb 27 22:55:46 2012
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Context;
/**
* Convenience base class for {@link Context} implementations.