You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/12/29 00:53:20 UTC
svn commit: r490873 - in /cocoon/trunk/core: cocoon-common/ cocoon-common/src/test/ cocoon-common/src/test/java/ cocoon-common/src/test/java/org/ cocoon-common/src/test/java/org/apache/ cocoon-common/src/test/java/org/apache/cocoon/ cocoon-common/src/t...

Author: danielf
Date: Thu Dec 28 15:53:19 2006
New Revision: 490873

URL: http://svn.apache.org/viewvc?view=rev&rev=490873
Log:
Moved some test cases to cocoon-common, cocoon-pipeline-impl and cocoon-util and made them work.

Added:
    cocoon/trunk/core/cocoon-common/src/test/
    cocoon/trunk/core/cocoon-common/src/test/java/
    cocoon/trunk/core/cocoon-common/src/test/java/org/
    cocoon/trunk/core/cocoon-common/src/test/java/org/apache/
    cocoon/trunk/core/cocoon-common/src/test/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-common/src/test/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-common/src/test/java/org/apache/cocoon/util/location/
      - copied from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/location/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/components/sax/
      - copied from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/sax/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/AbstractXMLTestCase.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/AbstractXMLTestCase.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/DefaultHandlerWrapper.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/DefaultHandlerWrapper.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/NamespacesTableTestCase.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/SaxBufferTestCase.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/SaxBufferTestCase.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/WhitespaceFilter.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/WhitespaceFilter.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/test/java/org/apache/cocoon/xml/dom/
      - copied from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/dom/
    cocoon/trunk/core/cocoon-util/src/main/resources/
    cocoon/trunk/core/cocoon-util/src/main/resources/org/
    cocoon/trunk/core/cocoon-util/src/main/resources/org/apache/
    cocoon/trunk/core/cocoon-util/src/main/resources/org/apache/cocoon/
    cocoon/trunk/core/cocoon-util/src/main/resources/org/apache/cocoon/util/
      - copied from r490786, cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-util/src/test/
    cocoon/trunk/core/cocoon-util/src/test/java/
    cocoon/trunk/core/cocoon-util/src/test/java/org/
    cocoon/trunk/core/cocoon-util/src/test/java/org/apache/
    cocoon/trunk/core/cocoon-util/src/test/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-util/src/test/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-util/src/test/java/org/apache/cocoon/util/WildcardMatcherHelperTestCase.java
      - copied unchanged from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/WildcardMatcherHelperTestCase.java
    cocoon/trunk/core/cocoon-util/src/test/java/org/apache/cocoon/util/test/
      - copied from r490786, cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/test/
Removed:
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/components/sax/
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/WildcardMatcherHelperTestCase.java
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/location/
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/util/test/
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/xml/
Modified:
    cocoon/trunk/core/cocoon-common/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
    cocoon/trunk/core/cocoon-util/pom.xml

Modified: cocoon/trunk/core/cocoon-common/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-common/pom.xml?view=diff&rev=490873&r1=490872&r2=490873
==============================================================================
--- cocoon/trunk/core/cocoon-common/pom.xml (original)
+++ cocoon/trunk/core/cocoon-common/pom.xml Thu Dec 28 15:53:19 2006
@@ -33,7 +33,7 @@
   <packaging>jar</packaging>
   <name>Cocoon Common</name>
   <dependencies>
-    <!--  excalibur -->
+    <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
@@ -45,11 +45,18 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- commons -->
+    <!-- Commons -->
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
       <version>2.1</version>
+    </dependency>
+    <!-- Test Dependencies  -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=490873&r1=490872&r2=490873
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Thu Dec 28 15:53:19 2006
@@ -86,7 +86,7 @@
       <artifactId>excalibur-instrument-api</artifactId>
       <version>2.1</version>
     </dependency>
-    <!-- commons -->
+    <!-- Commons -->
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
@@ -103,6 +103,19 @@
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <scope>provided</scope>
+    </dependency>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>0.8</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=diff&rev=490873&r1=490872&r2=490873
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (original)
+++ cocoon/trunk/core/cocoon-util/pom.xml Thu Dec 28 15:53:19 2006
@@ -33,16 +33,19 @@
   <packaging>jar</packaging>
   <name>Cocoon Util</name>
   <dependencies>
+    <!-- Cocoon -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-common</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
       <version>4.3</version>
     </dependency>
+    <!-- Commons -->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -62,6 +65,13 @@
       <groupId>jakarta-regexp</groupId>
       <artifactId>jakarta-regexp</artifactId>
       <version>1.4</version>
+    </dependency>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>