commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1294379 [2/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...
Date Mon, 27 Feb 2012 22:55:51 GMT
Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/impl/package-info.java Mon Feb 27 22:55:46 2012
@@ -17,6 +17,6 @@
 
 /**
  * Convenient base implementations of Chain of Responsibility Pattern
- * contracts from <code>org.apache.commons.chain</code>.
+ * contracts from <code>org.apache.commons.chain2</code>.
  */
-package org.apache.commons.chain.impl;
+package org.apache.commons.chain2.impl;

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/package-info.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/package-info.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/package-info.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/package-info.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/package-info.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/package-info.java Mon Feb 27 22:55:46 2012
@@ -18,10 +18,10 @@
 /**
  * The fundamental API contracts for the Chain of Responsibilty Pattern as
  * implemented in this package.  See
- * <a href="impl/package-summary.html">org.apache.commons.chain.impl</a> for
+ * <a href="impl/package-summary.html">org.apache.commons.chain2.impl</a> for
  * convenient base implementations of <code>Chain</code> and <code>Context</code>,
- * and see <a href="web/package-summary.html">org.apache.commons.chain.web</a> for
+ * and see <a href="web/package-summary.html">org.apache.commons.chain2.web</a> for
  * specialized <code>Context</code> implementations suitable for use in web
  * applications.
  */
-package org.apache.commons.chain;
+package org.apache.commons.chain2;

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractGetLocaleCommand.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.util.Locale;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
 
 
 /**

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/AbstractSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/AbstractSetLocaleCommand.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.util.Locale;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
 
 
 /**

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainListener.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainListener.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainListener.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainListener.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainListener.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainListener.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainListener.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.io.InputStream;
@@ -25,11 +25,12 @@ import java.util.Set;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.config.ConfigParser;
-import org.apache.commons.chain.impl.CatalogBase;
-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.config.ConfigParser;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
 import org.apache.commons.digester.RuleSet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -42,15 +43,15 @@ import org.apache.commons.logging.LogFac
  * specified servlet context attribute.  The following <em>context</em> init
  * parameters are utilized:</p>
  * <ul>
- * <li><strong>org.apache.commons.chain.CONFIG_CLASS_RESOURCE</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_CLASS_RESOURCE</strong> -
  *     comma-delimited list of chain configuration resources to be loaded
  *     via <code>ClassLoader.getResource()</code> calls.  If not specified,
  *     no class loader resources will be loaded.</li>
- * <li><strong>org.apache.commons.chain.CONFIG_WEB_RESOURCE</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_WEB_RESOURCE</strong> -
  *     comma-delimited list of chain configuration webapp resources
  *     to be loaded.  If not specified, no web application resources
  *     will be loaded.</li>
- * <li><strong>org.apache.commons.chain.CONFIG_ATTR</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_ATTR</strong> -
  *     Name of the servlet context attribute under which the
  *     resulting {@link Catalog} will be created or updated.
  *     If not specified, it is expected that parsed resources will
@@ -59,7 +60,7 @@ import org.apache.commons.logging.LogFac
  *     the {@link CatalogFactory} for this application, and no
  *     servet context attribute will be created.
  *     <strong>NOTE</strong> - This parameter is deprecated.</p>
- * <li><strong>org.apache.commons.chain.RULE_SET</strong> -
+ * <li><strong>org.apache.commons.chain2.RULE_SET</strong> -
  *     Fully qualified class name of a Digester <code>RuleSet</code>
  *     implementation to use for parsing configuration resources (this
  *     class must have a public zero-args constructor).  If not defined,
@@ -109,7 +110,7 @@ public class ChainListener implements Se
      * will be stored.</p>
      */
     public static final String CONFIG_ATTR =
-        "org.apache.commons.chain.CONFIG_ATTR";
+        "org.apache.commons.chain2.CONFIG_ATTR";
 
 
     /**
@@ -117,7 +118,7 @@ public class ChainListener implements Se
      * list of class loader resources to be scanned.</p>
      */
     public static final String CONFIG_CLASS_RESOURCE =
-        "org.apache.commons.chain.CONFIG_CLASS_RESOURCE";
+        "org.apache.commons.chain2.CONFIG_CLASS_RESOURCE";
 
 
     /**
@@ -125,7 +126,7 @@ public class ChainListener implements Se
      * list of web applicaton resources to be scanned.</p>
      */
     public static final String CONFIG_WEB_RESOURCE =
-        "org.apache.commons.chain.CONFIG_WEB_RESOURCE";
+        "org.apache.commons.chain2.CONFIG_WEB_RESOURCE";
 
 
     /**
@@ -134,7 +135,7 @@ public class ChainListener implements Se
      * for configuring our {@link ConfigParser}.</p>
      */
     public static final String RULE_SET =
-        "org.apache.commons.chain.RULE_SET";
+        "org.apache.commons.chain2.RULE_SET";
 
 
     // ------------------------------------------ ServletContextListener Methods

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainResources.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainResources.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainResources.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainResources.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainResources.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainResources.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainResources.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.net.URL;
@@ -23,8 +23,9 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import javax.servlet.ServletContext;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.config.ConfigParser;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.config.ConfigParser;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainServlet.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainServlet.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainServlet.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainServlet.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainServlet.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/ChainServlet.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/ChainServlet.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.io.IOException;
@@ -24,11 +24,12 @@ 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.config.ConfigParser;
-import org.apache.commons.chain.impl.CatalogBase;
-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.config.ConfigParser;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.web.servlet.ServletWebContext;
 import org.apache.commons.digester.RuleSet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -40,15 +41,15 @@ import org.apache.commons.logging.LogFac
  * {@link Catalog} under a specified servlet context attribute.  The following
  * <em>servlet</em> init parameters are utilized:</p>
  * <ul>
- * <li><strong>org.apache.commons.chain.CONFIG_CLASS_RESOURCE</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_CLASS_RESOURCE</strong> -
  *     comma-delimited list of chain configuration resources to be loaded
  *     via <code>ClassLoader.getResource()</code> calls.  If not specified,
  *     no class loader resources will be loaded.</li>
- * <li><strong>org.apache.commons.chain.CONFIG_WEB_RESOURCE</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_WEB_RESOURCE</strong> -
  *     comma-delimited list of chain configuration webapp resources
  *     to be loaded.  If not specified, no web application resources
  *     will be loaded.</li>
- * <li><strong>org.apache.commons.chain.CONFIG_ATTR</strong> -
+ * <li><strong>org.apache.commons.chain2.CONFIG_ATTR</strong> -
  *     Name of the servlet context attribute under which the
  *     resulting {@link Catalog} will be created or updated.
  *     If not specified, it is expected that parsed resources will
@@ -57,7 +58,7 @@ import org.apache.commons.logging.LogFac
  *     the {@link CatalogFactory} for this application, and no
  *     servet context attribute will be created.
  *     <strong>NOTE</strong> - This parameter is deprecated.</p>
- * <li><strong>org.apache.commons.chain.RULE_SET</strong> -
+ * <li><strong>org.apache.commons.chain2.RULE_SET</strong> -
  *     Fully qualified class name of a Digester <code>RuleSet</code>
  *     implementation to use for parsing configuration resources (this
  *     class must have a public zero-args constructor).  If not defined,
@@ -112,7 +113,7 @@ public class ChainServlet extends HttpSe
      * will be stored.</p>
      */
     public static final String CONFIG_ATTR =
-        "org.apache.commons.chain.CONFIG_ATTR";
+        "org.apache.commons.chain2.CONFIG_ATTR";
 
 
     /**
@@ -120,7 +121,7 @@ public class ChainServlet extends HttpSe
      * list of class loader resources to be scanned.</p>
      */
     public static final String CONFIG_CLASS_RESOURCE =
-        "org.apache.commons.chain.CONFIG_CLASS_RESOURCE";
+        "org.apache.commons.chain2.CONFIG_CLASS_RESOURCE";
 
 
     /**
@@ -128,7 +129,7 @@ public class ChainServlet extends HttpSe
      * list of web application resources to be scanned.</p>
      */
     public static final String CONFIG_WEB_RESOURCE =
-        "org.apache.commons.chain.CONFIG_WEB_RESOURCE";
+        "org.apache.commons.chain2.CONFIG_WEB_RESOURCE";
 
 
     /**
@@ -137,7 +138,7 @@ public class ChainServlet extends HttpSe
      * for configuring our {@link ConfigParser}.</p>
      */
     public static final String RULE_SET =
-        "org.apache.commons.chain.RULE_SET";
+        "org.apache.commons.chain2.RULE_SET";
 
 
     // --------------------------------------------------------- Servlet Methods

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/MapEntry.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/MapEntry.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/MapEntry.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/MapEntry.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/MapEntry.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/MapEntry.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/MapEntry.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.util.Map;

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/WebContext.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/WebContext.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/WebContext.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/WebContext.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/WebContext.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/WebContext.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/WebContext.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.web;
+package org.apache.commons.chain2.web;
 
 
 import java.util.Map;
 import javax.servlet.http.Cookie;
-import org.apache.commons.chain.impl.ContextBase;
+
+import org.apache.commons.chain2.impl.ContextBase;
 
 
 /**
- * <p>Abstract base implementation of {@link org.apache.commons.chain.Context} that
+ * <p>Abstract base implementation of {@link org.apache.commons.chain2.Context} that
  * provides web based applications that use it a "generic" view of HTTP related
  * requests and responses, without tying the application to a particular underlying
  * Java API (such as servlets).  It is expected that a concrete subclass
  * of {@link WebContext} for each API (such as
- * {@link org.apache.commons.chain.web.servlet.ServletWebContext})
+ * {@link org.apache.commons.chain2.web.servlet.ServletWebContext})
  * will support adapting that particular API's implementation of request
  * and response objects into this generic framework.</p>
  *

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesGetLocaleCommand.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.web.faces;
+package org.apache.commons.chain2.web.faces;
 
 
 import java.util.Locale;
 
 import javax.faces.context.FacesContext;
 
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractGetLocaleCommand;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractGetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesSetLocaleCommand.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.faces;
+package org.apache.commons.chain2.web.faces;
 
 
 import java.util.Locale;
 import javax.faces.context.FacesContext;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractSetLocaleCommand;
+
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractSetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/FacesWebContext.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.web.faces;
+package org.apache.commons.chain2.web.faces;
 
 
 import java.util.Collections;
@@ -22,7 +22,8 @@ import java.util.Iterator;
 import java.util.Map;
 import javax.faces.context.FacesContext;
 import javax.servlet.http.Cookie;
-import org.apache.commons.chain.web.WebContext;
+
+import org.apache.commons.chain2.web.WebContext;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/faces/package-info.java Mon Feb 27 22:55:46 2012
@@ -19,4 +19,4 @@
  * Specialized <code>Context</code> and <code>Command</code> implementations
  * suitable for use in a JavaServer Faces API environment.
  */
-package org.apache.commons.chain.web.faces;
+package org.apache.commons.chain2.web.faces;

Copied: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/package-info.java (from r1294375, commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/package-info.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/package-info.java?p2=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/package-info.java&p1=commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/package-info.java&r1=1294375&r2=1294379&rev=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain/web/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/package-info.java Mon Feb 27 22:55:46 2012
@@ -20,4 +20,4 @@
  * in web applications, and generic <code>Command</code> implementations useful
  * across web application environments.
  */
-package org.apache.commons.chain.web;
+package org.apache.commons.chain2.web;

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletApplicationScopeMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletContext;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletGetLocaleCommand.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.Locale;
 import javax.portlet.PortletRequest;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractGetLocaleCommand;
+
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractGetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletInitParamMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletContext;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletParamValuesMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletRequestScopeMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSessionScopeMap.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.ArrayList;
@@ -26,7 +26,8 @@ import java.util.Map;
 import java.util.Set;
 import javax.portlet.PortletSession;
 import javax.portlet.PortletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletSetLocaleCommand.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.Locale;
 //import javax.portlet.PortletResponse;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractSetLocaleCommand;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractSetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/PortletWebContext.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.web.portlet;
+package org.apache.commons.chain2.web.portlet;
 
 
 import java.util.Collections;
@@ -23,7 +23,8 @@ import javax.portlet.PortletContext;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 import javax.servlet.http.Cookie;
-import org.apache.commons.chain.web.WebContext;
+
+import org.apache.commons.chain2.web.WebContext;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/portlet/package-info.java Mon Feb 27 22:55:46 2012
@@ -19,4 +19,4 @@
  * Specialized <code>Context</code> and <code>Command</code> implementations
  * suitable for use in a Portlet API environment.
  */
-package org.apache.commons.chain.web.portlet;
+package org.apache.commons.chain2.web.portlet;

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ChainProcessor.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.io.IOException;
@@ -24,10 +24,10 @@ import javax.servlet.ServletException;
 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.ChainServlet;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.web.ChainServlet;
 
 
 /**
@@ -39,18 +39,18 @@ import org.apache.commons.chain.web.Chai
  * {@link ChainServlet}, this class supports the following additional
  * parameters:</p>
  * <ul>
- * <li><strong>org.apache.commons.chain.CATALOG</strong> - Name of the
+ * <li><strong>org.apache.commons.chain2.CATALOG</strong> - Name of the
  *     catalog from which to acquire commands to be executed.  If not
  *     specified, the default catalog for this application will be used.</li>
- * <li><strong>org.apache.commons.chain.COMMAND</strong> - Name of the
+ * <li><strong>org.apache.commons.chain2.COMMAND</strong> - Name of the
  *     {@link Command} (looked up in our configured {@link Catalog} used
  *     to process all incoming servlet requests.  If not specified,
  *     defaults to <code>command</code>.</li>
  * </ul>
  *
- * <p>Also, the <code>org.apache.commons.chain.CONFIG_ATTR</code>
+ * <p>Also, the <code>org.apache.commons.chain2.CONFIG_ATTR</code>
  * init parameter is also used to identify the
- * {@link org.apache.commons.chain.Context} attribute under
+ * {@link org.apache.commons.chain2.Context} attribute under
  * which our configured {@link Catalog} will be made available to
  * {@link Command}s processing our requests, in addition to its definition
  * of the <code>ServletContext</code> attribute key under which the
@@ -74,7 +74,7 @@ public class ChainProcessor extends Chai
      * {@link Catalog} to use for processing incoming requests.</p>
      */
     public static final String CATALOG =
-        "org.apache.commons.chain.CATALOG";
+        "org.apache.commons.chain2.CATALOG";
 
 
     /**
@@ -82,7 +82,7 @@ public class ChainProcessor extends Chai
      * {@link Catalog} being used to subordinate {@link Command}s.</p>
      */
     public static final String CATALOG_DEFAULT =
-        "org.apache.commons.chain.CATALOG";
+        "org.apache.commons.chain2.CATALOG";
 
 
     /**
@@ -91,7 +91,7 @@ public class ChainProcessor extends Chai
      * for processing each incoming request.</p>
      */
     public static final String COMMAND =
-        "org.apache.commons.chain.COMMAND";
+        "org.apache.commons.chain2.COMMAND";
 
 
     /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java Mon Feb 27 22:55:46 2012
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.generic.LookupCommand;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.LookupCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java Mon Feb 27 22:55:46 2012
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.generic.LookupCommand;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.LookupCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletApplicationScopeMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.ServletContext;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletCookieMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.Cookie;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletGetLocaleCommand.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractGetLocaleCommand;
+
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractGetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletHeaderValuesMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletInitParamMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.ServletContext;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletParamValuesMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java Mon Feb 27 22:55:46 2012
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.generic.LookupCommand;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.LookupCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletRequestScopeMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -25,7 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSessionScopeMap.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.ArrayList;
@@ -26,7 +26,8 @@ import java.util.Map;
 import java.util.Set;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.chain.web.MapEntry;
+
+import org.apache.commons.chain2.web.MapEntry;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletSetLocaleCommand.java Mon Feb 27 22:55:46 2012
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.Locale;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.AbstractSetLocaleCommand;
+
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.web.AbstractSetLocaleCommand;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/ServletWebContext.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.web.servlet;
+package org.apache.commons.chain2.web.servlet;
 
 
 import java.util.Map;
@@ -22,7 +22,8 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.web.WebContext;
+
+import org.apache.commons.chain2.web.WebContext;
 
 
 /**

Modified: commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/package-info.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/package-info.java (original)
+++ commons/proper/chain/trunk/src/main/java/org/apache/commons/chain2/web/servlet/package-info.java Mon Feb 27 22:55:46 2012
@@ -19,4 +19,4 @@
  * Specialized <code>Context</code> and <code>Command</code> implementations
  * suitable for use in a Servlet API environment.
  */
-package org.apache.commons.chain.web.servlet;
+package org.apache.commons.chain2.web.servlet;

Modified: commons/proper/chain/trunk/src/site/xdoc/cookbook.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/site/xdoc/cookbook.xml?rev=1294379&r1=1294378&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/site/xdoc/cookbook.xml (original)
+++ commons/proper/chain/trunk/src/site/xdoc/cookbook.xml Mon Feb 27 22:55:46 2012
@@ -267,11 +267,11 @@
       <source><![CDATA[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 {
 
@@ -351,10 +351,10 @@ public class ProfileCheckTest extends Te
     <example>
       <title>A Command to create a Profile, if one doesn't exist.</title>
 
-      <source><![CDATA[package org.apache.commons.chain.mailreader.commands;
+      <source><![CDATA[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 {
 
@@ -378,7 +378,7 @@ public class ProfileCheck implements Com
     <example>
       <title>The simplest Profile class that can possibly work.</title>
 
-      <source><![CDATA[package org.apache.commons.chain.mailreader.commands; 
+      <source><![CDATA[package org.apache.commons.chain2.mailreader.commands; 
 public class Profile { 
     public static String PROFILE_KEY = "profile"; 
 }]]></source>
@@ -538,7 +538,7 @@ public class Profile { 
         <p><source><![CDATA[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 {
@@ -580,8 +580,8 @@ public class LocaleValueTest extends Tes
         <title>The simplest MailReader object that will pass
         LocalValueTest.</title>
 
-        <p><source><![CDATA[package org.apache.commons.chain.mailreader;
-import org.apache.commons.chain.impl.ContextBase;
+        <p><source><![CDATA[package org.apache.commons.chain2.mailreader;
+import org.apache.commons.chain2.impl.ContextBase;
 import java.util.Locale;
 
 public class MailReader extends ContextBase {Prop
@@ -605,8 +605,8 @@ public class MailReader extends ContextB
         <title>An even simpler MailReader Context (but that would fail
         LocalValueTest).</title>
 
-        <p><source><![CDATA[package org.apache.commons.chain.mailreader;
-import org.apache.commons.chain.Context;
+        <p><source><![CDATA[package org.apache.commons.chain2.mailreader;
+import org.apache.commons.chain2.Context;
 import java.util.Hashmap;
 
 public class MailReader extends Hashmap implements Context {
@@ -690,10 +690,10 @@ public class MailReader extends Hashmap 
 <catalog>
   <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"/>
 </catalog>]]></source></p>
       </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
@@ -711,13 +711,13 @@ public class MailReader extends Hashmap 
         <p><source><![CDATA[<catalog>
   <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"/>
 </catalog>]]></source></p>
       </example></p>
 
@@ -758,11 +758,11 @@ public class MailReader extends Hashmap 
 
         <source><![CDATA[<!-- 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>]]></source>
       </example></p>
     <p>The elements in <!-- Example 11 --> this example expect that there is a
@@ -910,7 +910,7 @@ public class MailReader extends Hashmap 
 <catalog>
     <command
         name="<em>LocaleChange</em>"
-        className="org.apache.commons.chain.mailreader.commands.LocaleChange" />
+        className="org.apache.commons.chain2.mailreader.commands.LocaleChange" />
 </catalog>
 
 <!-- validation.xml -->
@@ -945,7 +945,7 @@ public class MailReader extends Hashmap 
     <action-mappings>
         <action path="/LocaleChange"
             name="<em>LocaleChange</em>"
-            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>
@@ -958,11 +958,11 @@ public class MailReader extends Hashmap 
         <title>The CommandAction links the form-bean name with the Command
         name</title>
 
-        <p><source><![CDATA[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;
+        <p><source><![CDATA[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.
@@ -1295,8 +1295,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;
@@ -1353,7 +1353,7 @@ public class HandlerCommand implements C
         <p><source><![CDATA[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 {
 
@@ -1387,8 +1387,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) {
@@ -1434,7 +1434,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/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParser2TestCase.java Mon Feb 27 22:55:46 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,21 +24,23 @@ import static org.junit.Assert.assertTru
 
 import java.util.Iterator;
 
-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.impl.AddingCommand;
-import org.apache.commons.chain.impl.CatalogBase;
-import org.apache.commons.chain.impl.CatalogFactoryBase;
-import org.apache.commons.chain.impl.ChainBase;
-import org.apache.commons.chain.impl.ContextBase;
-import org.apache.commons.chain.impl.DelegatingCommand;
-import org.apache.commons.chain.impl.DelegatingFilter;
-import org.apache.commons.chain.impl.ExceptionCommand;
-import org.apache.commons.chain.impl.ExceptionFilter;
-import org.apache.commons.chain.impl.NonDelegatingCommand;
-import org.apache.commons.chain.impl.NonDelegatingFilter;
+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.config.ConfigParser;
+import org.apache.commons.chain2.config.ConfigRuleSet;
+import org.apache.commons.chain2.impl.AddingCommand;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
+import org.apache.commons.chain2.impl.ChainBase;
+import org.apache.commons.chain2.impl.ContextBase;
+import org.apache.commons.chain2.impl.DelegatingCommand;
+import org.apache.commons.chain2.impl.DelegatingFilter;
+import org.apache.commons.chain2.impl.ExceptionCommand;
+import org.apache.commons.chain2.impl.ExceptionFilter;
+import org.apache.commons.chain2.impl.NonDelegatingCommand;
+import org.apache.commons.chain2.impl.NonDelegatingFilter;
 import org.apache.commons.digester.Digester;
 import org.junit.After;
 import org.junit.Before;
@@ -55,7 +57,7 @@ public class ConfigParser2TestCase {
 
 
     private static final String DEFAULT_XML =
-        "/org/apache/commons/chain/config/test-config-2.xml";
+        "/org/apache/commons/chain2/config/test-config-2.xml";
 
 
     // ------------------------------------------------------ Instance Variables

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/ConfigParserTestCase.java Mon Feb 27 22:55:46 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.chain.config;
+package org.apache.commons.chain2.config;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -24,21 +24,23 @@ import static org.junit.Assert.assertTru
 
 import java.util.Iterator;
 
-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.impl.AddingCommand;
-import org.apache.commons.chain.impl.CatalogBase;
-import org.apache.commons.chain.impl.CatalogFactoryBase;
-import org.apache.commons.chain.impl.ChainBase;
-import org.apache.commons.chain.impl.ContextBase;
-import org.apache.commons.chain.impl.DelegatingCommand;
-import org.apache.commons.chain.impl.DelegatingFilter;
-import org.apache.commons.chain.impl.ExceptionCommand;
-import org.apache.commons.chain.impl.ExceptionFilter;
-import org.apache.commons.chain.impl.NonDelegatingCommand;
-import org.apache.commons.chain.impl.NonDelegatingFilter;
+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.config.ConfigParser;
+import org.apache.commons.chain2.config.ConfigRuleSet;
+import org.apache.commons.chain2.impl.AddingCommand;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
+import org.apache.commons.chain2.impl.ChainBase;
+import org.apache.commons.chain2.impl.ContextBase;
+import org.apache.commons.chain2.impl.DelegatingCommand;
+import org.apache.commons.chain2.impl.DelegatingFilter;
+import org.apache.commons.chain2.impl.ExceptionCommand;
+import org.apache.commons.chain2.impl.ExceptionFilter;
+import org.apache.commons.chain2.impl.NonDelegatingCommand;
+import org.apache.commons.chain2.impl.NonDelegatingFilter;
 import org.apache.commons.digester.Digester;
 import org.junit.After;
 import org.junit.Before;
@@ -46,14 +48,14 @@ import org.junit.Test;
 
 
 /**
- * <p>Test Case for <code>org.apache.commons.chain.config.ConfigParser</code>.</p>
+ * <p>Test Case for <code>org.apache.commons.chain2.config.ConfigParser</code>.</p>
  */
 
 public class ConfigParserTestCase {
 
 
     private static final String DEFAULT_XML =
-        "/org/apache/commons/chain/config/test-config.xml";
+        "/org/apache/commons/chain2/config/test-config.xml";
 
 
     // ------------------------------------------------------ Instance Variables

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestChain.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestChain.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestChain.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestChain.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.config;
+package org.apache.commons.chain2.config;
 
 
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.impl.ChainBase;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.impl.ChainBase;
 
 
 /**

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestCommand.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/config/TestCommand.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.config;
+package org.apache.commons.chain2.config;
 
 
-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/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.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.generic;
+package org.apache.commons.chain2.generic;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,11 +22,12 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.impl.ContextBase;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.DispatchCommand;
+import org.apache.commons.chain2.impl.ContextBase;
 import org.junit.Test;
 
-/* JUnitTest case for class: org.apache.commons.chain.generic.DispatchCommand */
+/* JUnitTest case for class: org.apache.commons.chain2.generic.DispatchCommand */
 public class DispatchCommandTestCase {
 
     @Test

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java Mon Feb 27 22:55:46 2012
@@ -14,17 +14,18 @@
  * 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 static org.junit.Assert.*;
 
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.impl.CatalogBase;
-import org.apache.commons.chain.impl.ContextBase;
-import org.apache.commons.chain.impl.CatalogFactoryBase;
-import org.apache.commons.chain.impl.NonDelegatingCommand;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.DispatchLookupCommand;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
+import org.apache.commons.chain2.impl.ContextBase;
+import org.apache.commons.chain2.impl.NonDelegatingCommand;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.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.generic;
+package org.apache.commons.chain2.generic;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,16 +22,17 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.Chain;
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.impl.CatalogBase;
-import org.apache.commons.chain.impl.CatalogFactoryBase;
-import org.apache.commons.chain.impl.ChainBase;
-import org.apache.commons.chain.impl.ContextBase;
-import org.apache.commons.chain.impl.DelegatingCommand;
-import org.apache.commons.chain.impl.NonDelegatingCommand;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Chain;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.generic.LookupCommand;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.impl.CatalogFactoryBase;
+import org.apache.commons.chain2.impl.ChainBase;
+import org.apache.commons.chain2.impl.ContextBase;
+import org.apache.commons.chain2.impl.DelegatingCommand;
+import org.apache.commons.chain2.impl.NonDelegatingCommand;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/AddingCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/AddingCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/AddingCommand.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/AddingCommand.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 org.apache.commons.chain.Chain;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Chain;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
 
 
 /**

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogBaseTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogBaseTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogBaseTestCase.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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,9 +23,11 @@ import static org.junit.Assert.assertTru
 
 import java.util.Iterator;
 
-import org.apache.commons.chain.Catalog;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.impl.CatalogBase;
+import org.apache.commons.chain2.impl.ChainBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,10 +25,11 @@ import static org.junit.Assert.fail;
 
 import java.util.Iterator;
 
-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.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.impl.CatalogBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,9 +23,11 @@ import static org.junit.Assert.fail;
 
 import java.util.List;
 
-import org.apache.commons.chain.Chain;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
+import org.apache.commons.chain2.Chain;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.impl.ChainBase;
+import org.apache.commons.chain2.impl.ContextBase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -33,8 +33,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.impl.ContextBase;
+import org.apache.commons.chain2.web.WebContext;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingCommand.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingCommand.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingCommand.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingCommand.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.impl;
+package org.apache.commons.chain2.impl;
 
 
-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/test/java/org/apache/commons/chain2/impl/DelegatingFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingFilter.java?rev=1294379&r1=1294375&r2=1294379&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingFilter.java (original)
+++ commons/proper/chain/trunk/src/test/java/org/apache/commons/chain2/impl/DelegatingFilter.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.impl;
+package org.apache.commons.chain2.impl;
 
 
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.Filter;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.Filter;
 
 
 /**



Mime
View raw message