cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r330794 - in /cocoon/whiteboard/maven2/cocoon-flat-layout: ./ cocoon-ajax/ cocoon-ajax/api/ cocoon-ajax/impl/ cocoon-ajax/samples/ cocoon-asciiart/ cocoon-asciiart/impl/ cocoon-asciiart/samples/ cocoon-core/ cocoon-forms/ cocoon-forms/api/ ...
Date Fri, 04 Nov 2005 11:15:43 GMT
Author: jheymans
Date: Fri Nov  4 03:15:26 2005
New Revision: 330794

URL: http://svn.apache.org/viewcvs?rev=330794&view=rev
Log:
- moving dependencies to impl poms
- all unittests are working now, run with -Dmaven.test.failure.ignore=true because our tests
are currently failing

Modified:
    cocoon/whiteboard/maven2/cocoon-flat-layout/   (props changed)
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/api/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/impl/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/samples/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/impl/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/samples/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/   (props changed)
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/api/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/impl/pom.xml
    cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/pom.xml

Propchange: cocoon/whiteboard/maven2/cocoon-flat-layout/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov  4 03:15:26 2005
@@ -1,3 +1,4 @@
 .classpath
 .project
 .wtpmodules
+work

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/api/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/api/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/api/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/api/pom.xml Fri Nov  4 03:15:26
2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-ajax-block</artifactId>
+    <artifactId>cocoon-ajax</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/impl/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/impl/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/impl/pom.xml Fri Nov  4 03:15:26
2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-ajax-block</artifactId>
+    <artifactId>cocoon-ajax</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,8 +33,13 @@
   <dependencies>
     <dependency>
       <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
       <artifactId>cocoon-ajax-api</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/pom.xml Fri Nov  4 03:15:26 2005
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>apache-cocoon</groupId>
-  <artifactId>cocoon-ajax-block</artifactId>
+  <artifactId>cocoon-ajax</artifactId>
   <version>2.2-SNAPSHOT</version>
   <name>Ajax Block</name>
   <packaging>pom</packaging>
@@ -35,25 +35,4 @@
     <module>impl</module>
     <module>samples</module>
   </modules>
-  <dependencies>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <!-- 
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-      <classifier>tests</classifier>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-forms-impl</artifactId>
-      <version>2.2-SNAPSHOT</version>
-      <classifier>tests</classifier>
-    </dependency>
-     -->
-  </dependencies>
 </project>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/samples/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/samples/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/samples/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-ajax/samples/pom.xml Fri Nov  4 03:15:26
2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-ajax-block</artifactId>
+    <artifactId>cocoon-ajax</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/impl/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/impl/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/impl/pom.xml Fri Nov  4 03:15:26
2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-asciiart-block</artifactId>
+    <artifactId>cocoon-asciiart</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -30,4 +30,11 @@
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ascii Art Implementation</name>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/pom.xml Fri Nov  4 03:15:26
2005
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>apache-cocoon</groupId>
-  <artifactId>cocoon-asciiart-block</artifactId>
+  <artifactId>cocoon-asciiart</artifactId>
   <version>2.2-SNAPSHOT</version>
   <name>Ascii Art Block</name>
   <packaging>pom</packaging>
@@ -34,11 +34,4 @@
     <module>impl</module>
     <module>samples</module>
   </modules>
-  <dependencies>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
 </project>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/samples/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/samples/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/samples/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-asciiart/samples/pom.xml Fri Nov  4
03:15:26 2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-asciiart-block</artifactId>
+    <artifactId>cocoon-asciiart</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Propchange: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov  4 03:15:26 2005
@@ -0,0 +1 @@
+work

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-core/pom.xml Fri Nov  4 03:15:26 2005
@@ -344,11 +344,11 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <!-- TODO cannot set scope to test here -->
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
       <version>0.8</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/api/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/api/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/api/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/api/pom.xml Fri Nov  4 03:15:26
2005
@@ -21,7 +21,7 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon-forms-block</artifactId>
+    <artifactId>cocoon-forms</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/impl/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/impl/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/impl/pom.xml Fri Nov  4 03:15:26
2005
@@ -31,5 +31,47 @@
       <artifactId>cocoon-forms-api</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-ajax-impl</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-oro</groupId>
+      <artifactId>jakarta-oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>xreporter</groupId>
+      <artifactId>xreporter-expression</artifactId>
+      <version>20040701</version>
+    </dependency>
+    <dependency>
+      <groupId>daisy</groupId>
+      <artifactId>daisy-htmlcleaner</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>icu4j</groupId>
+      <artifactId>icu4j</artifactId>
+      <version>3.0</version>
+    </dependency>
   </dependencies>
 </project>

Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/pom.xml?rev=330794&r1=330793&r2=330794&view=diff
==============================================================================
--- cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/pom.xml (original)
+++ cocoon/whiteboard/maven2/cocoon-flat-layout/cocoon-forms/pom.xml Fri Nov  4 03:15:26 2005
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>apache-cocoon</groupId>
-  <artifactId>cocoon-forms-block</artifactId>
+  <artifactId>cocoon-forms</artifactId>
   <version>2.2-SNAPSHOT</version>
   <name>Forms Block</name>
   <packaging>pom</packaging>
@@ -35,49 +35,4 @@
     <module>impl</module>
     <module>samples</module>
   </modules>
-  <dependencies>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <!--
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-      <classifier>tests</classifier>
-    </dependency>
-        -->
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-ajax-impl</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-oro</groupId>
-      <artifactId>jakarta-oro</artifactId>
-      <version>2.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>xreporter</groupId>
-      <artifactId>xreporter-expression</artifactId>
-      <version>20040701</version>
-    </dependency>
-    <dependency>
-      <groupId>daisy</groupId>
-      <artifactId>daisy-htmlcleaner</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>icu4j</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>3.0</version>
-    </dependency>
-  </dependencies>
 </project>



Mime
View raw message