You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2013/06/15 13:53:35 UTC

svn commit: r1493342 - in /commons/proper/chain/trunk: ./ apps/cookbook-examples/ apps/example1/ apps/example2/ base/ base/src/main/java/org/apache/commons/chain2/base/ base/src/main/java/org/apache/commons/chain2/generic/ base/src/main/java/org/apache...

Author: britter
Date: Sat Jun 15 11:53:34 2013
New Revision: 1493342

URL: http://svn.apache.org/r1493342
Log:
CHAIN-83 - Rename o.a.c.chain2.generic package to o.a.c.chain2.base

Added:
    commons/proper/chain/trunk/base/
      - copied from r1491908, commons/proper/chain/trunk/core/
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/CopyCommand.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchCommand.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchException.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchLookupCommand.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/LookupCommand.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/RemoveCommand.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/package-info.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/package-info.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
      - copied unchanged from r1491930, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/impl/ChainBase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java
      - copied, changed from r1493246, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/CopyCommandTest.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchCommandTestCase.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java
      - copied, changed from r1491908, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java
      - copied, changed from r1492408, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
      - copied unchanged from r1491949, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ChainBaseTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
      - copied unchanged from r1492409, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ContextBaseTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/impl/ExceptionCommand.java
      - copied unchanged from r1493202, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/impl/ExceptionCommand.java
Removed:
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/DispatchException.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java
    commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/generic/package-info.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java
    commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java
    commons/proper/chain/trunk/core/
Modified:
    commons/proper/chain/trunk/apps/cookbook-examples/pom.xml
    commons/proper/chain/trunk/apps/example1/pom.xml
    commons/proper/chain/trunk/apps/example2/pom.xml
    commons/proper/chain/trunk/base/pom.xml
    commons/proper/chain/trunk/configuration/api/pom.xml
    commons/proper/chain/trunk/configuration/xml/pom.xml
    commons/proper/chain/trunk/dist/pom.xml
    commons/proper/chain/trunk/pom.xml
    commons/proper/chain/trunk/src/changes/changes.xml
    commons/proper/chain/trunk/src/site/xdoc/modules.xml.vm
    commons/proper/chain/trunk/web/pom.xml
    commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java
    commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java
    commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java

Modified: commons/proper/chain/trunk/apps/cookbook-examples/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/cookbook-examples/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/cookbook-examples/pom.xml (original)
+++ commons/proper/chain/trunk/apps/cookbook-examples/pom.xml Sat Jun 15 11:53:34 2013
@@ -34,7 +34,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: commons/proper/chain/trunk/apps/example1/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/pom.xml (original)
+++ commons/proper/chain/trunk/apps/example1/pom.xml Sat Jun 15 11:53:34 2013
@@ -44,7 +44,7 @@
 
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: commons/proper/chain/trunk/apps/example2/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/pom.xml (original)
+++ commons/proper/chain/trunk/apps/example2/pom.xml Sat Jun 15 11:53:34 2013
@@ -44,7 +44,7 @@
 
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.version}</version>
     </dependency>
 

Modified: commons/proper/chain/trunk/base/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/pom.xml?rev=1493342&r1=1491908&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/base/pom.xml (original)
+++ commons/proper/chain/trunk/base/pom.xml Sat Jun 15 11:53:34 2013
@@ -28,9 +28,9 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>commons-chain2-core</artifactId>
+  <artifactId>commons-chain2-base</artifactId>
 
-  <name>Apache Commons Chain :: Core</name>
+  <name>Apache Commons Chain :: Base</name>
 
   <dependencies>
     <dependency>

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/CopyCommand.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/CopyCommand.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/CopyCommand.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/CopyCommand.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/CopyCommand.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.Command;
 import org.apache.commons.chain2.Context;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchCommand.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchCommand.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchCommand.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchCommand.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchCommand.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.Command;
 import org.apache.commons.chain2.Context;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchException.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchException.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchException.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchException.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchException.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.ChainException;
 import org.apache.commons.chain2.Command;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchLookupCommand.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchLookupCommand.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchLookupCommand.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/DispatchLookupCommand.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/DispatchLookupCommand.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.CatalogFactory;
 import org.apache.commons.chain2.Command;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/LookupCommand.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/LookupCommand.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/LookupCommand.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/LookupCommand.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/LookupCommand.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.Catalog;
 import org.apache.commons.chain2.CatalogFactory;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/RemoveCommand.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/RemoveCommand.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/RemoveCommand.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/RemoveCommand.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/RemoveCommand.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.Command;
 import org.apache.commons.chain2.Context;

Copied: commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/package-info.java (from r1491908, commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/package-info.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/package-info.java?p2=commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/package-info.java&p1=commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/package-info.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/main/java/org/apache/commons/chain2/generic/package-info.java (original)
+++ commons/proper/chain/trunk/base/src/main/java/org/apache/commons/chain2/base/package-info.java Sat Jun 15 11:53:34 2013
@@ -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.chain2.generic;
+package org.apache.commons.chain2.base;

Copied: commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java (from r1493246, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/CopyCommandTest.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java?p2=commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java&p1=commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/CopyCommandTest.java&r1=1493246&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/CopyCommandTest.java (original)
+++ commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/CopyCommandTest.java Sat Jun 15 11:53:34 2013
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNull;

Copied: commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchCommandTestCase.java (from r1491908, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchCommandTestCase.java?p2=commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchCommandTestCase.java&p1=commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchCommandTestCase.java (original)
+++ commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchCommandTestCase.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import org.apache.commons.chain2.Context;
 import org.apache.commons.chain2.impl.ContextBase;
@@ -22,7 +22,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-/* JUnitTest case for class: org.apache.commons.chain2.generic.DispatchCommand */
+/* JUnitTest case for class: org.apache.commons.chain2.base.DispatchCommand */
 public class DispatchCommandTestCase {
 
     @Test

Copied: commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java (from r1491908, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java?p2=commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java&p1=commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java&r1=1491908&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/DispatchLookupCommandTestCase.java (original)
+++ commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/DispatchLookupCommandTestCase.java Sat Jun 15 11:53:34 2013
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import static org.junit.Assert.*;
 
 import org.apache.commons.chain2.Catalog;
 import org.apache.commons.chain2.CatalogFactory;
 import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.base.DispatchLookupCommand;
 import org.apache.commons.chain2.impl.CatalogBase;
 import org.apache.commons.chain2.impl.CatalogFactoryBase;
 import org.apache.commons.chain2.impl.ContextBase;

Copied: commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java (from r1492408, commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java)
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java?p2=commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java&p1=commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java&r1=1492408&r2=1493342&rev=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/core/src/test/java/org/apache/commons/chain2/generic/LookupCommandTestCase.java (original)
+++ commons/proper/chain/trunk/base/src/test/java/org/apache/commons/chain2/base/LookupCommandTestCase.java Sat Jun 15 11:53:34 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.chain2.generic;
+package org.apache.commons.chain2.base;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,6 +26,7 @@ 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.base.LookupCommand;
 import org.apache.commons.chain2.impl.CatalogBase;
 import org.apache.commons.chain2.impl.CatalogFactoryBase;
 import org.apache.commons.chain2.impl.ChainBase;

Modified: commons/proper/chain/trunk/configuration/api/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/api/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/api/pom.xml (original)
+++ commons/proper/chain/trunk/configuration/api/pom.xml Sat Jun 15 11:53:34 2013
@@ -35,13 +35,13 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: commons/proper/chain/trunk/configuration/xml/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/configuration/xml/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/configuration/xml/pom.xml (original)
+++ commons/proper/chain/trunk/configuration/xml/pom.xml Sat Jun 15 11:53:34 2013
@@ -34,7 +34,7 @@
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 
@@ -51,7 +51,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: commons/proper/chain/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/dist/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/dist/pom.xml (original)
+++ commons/proper/chain/trunk/dist/pom.xml Sat Jun 15 11:53:34 2013
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>

Modified: commons/proper/chain/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Sat Jun 15 11:53:34 2013
@@ -41,7 +41,7 @@
   <modules>
     <module>build-tools</module>
     <module>api</module>
-    <module>core</module>
+    <module>base</module>
     <module>configuration/api</module>
     <module>configuration/xml</module>
     <module>web</module>

Modified: commons/proper/chain/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/changes/changes.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/changes/changes.xml (original)
+++ commons/proper/chain/trunk/src/changes/changes.xml Sat Jun 15 11:53:34 2013
@@ -41,6 +41,9 @@ The <action> type attribute can be add,u
 
   <body>
     <release version="2.0" description="Major release">
+      <action issue="CHAIN-83" dev="britter" type="add">
+          Rename o.a.c.chain2.generic package to o.a.c.chain2.base
+      </action>
       <action issue="CHAIN-90" dev="britter" type="add">
           Create test for o.a.c.chain.generic.CopyCommand
       </action>

Modified: commons/proper/chain/trunk/src/site/xdoc/modules.xml.vm
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/site/xdoc/modules.xml.vm?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/site/xdoc/modules.xml.vm (original)
+++ commons/proper/chain/trunk/src/site/xdoc/modules.xml.vm Sat Jun 15 11:53:34 2013
@@ -37,7 +37,7 @@
     ...
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.version}</version>
     </dependency>
     ...

Modified: commons/proper/chain/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/pom.xml?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/pom.xml (original)
+++ commons/proper/chain/trunk/web/pom.xml Sat Jun 15 11:53:34 2013
@@ -46,7 +46,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 
@@ -127,7 +127,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>commons-chain2-core</artifactId>
+      <artifactId>commons-chain2-base</artifactId>
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/PathInfoMapper.java Sat Jun 15 11:53:34 2013
@@ -19,7 +19,7 @@ package org.apache.commons.chain2.web.se
 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;
+import org.apache.commons.chain2.base.LookupCommand;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/RequestParameterMapper.java Sat Jun 15 11:53:34 2013
@@ -19,7 +19,7 @@ package org.apache.commons.chain2.web.se
 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;
+import org.apache.commons.chain2.base.LookupCommand;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java
URL: http://svn.apache.org/viewvc/commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java?rev=1493342&r1=1493341&r2=1493342&view=diff
==============================================================================
--- commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java (original)
+++ commons/proper/chain/trunk/web/src/main/java/org/apache/commons/chain2/web/servlet/ServletPathMapper.java Sat Jun 15 11:53:34 2013
@@ -19,7 +19,7 @@ package org.apache.commons.chain2.web.se
 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;
+import org.apache.commons.chain2.base.LookupCommand;
 
 import javax.servlet.http.HttpServletRequest;