You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/03 11:48:31 UTC

svn commit: r581543 - in /cocoon/trunk/blocks: ./ cocoon-imageop/cocoon-imageop-impl/ cocoon-imageop/cocoon-imageop-sample/ cocoon-itext/cocoon-itext-impl/ cocoon-itext/cocoon-itext-sample/ cocoon-jfor/ cocoon-jfor/cocoon-jfor-impl/ cocoon-jfor/cocoon-...

Author: vgritsenko
Date: Wed Oct  3 02:48:30 2007
New Revision: 581543

URL: http://svn.apache.org/viewvc?rev=581543&view=rev
Log:
more flattening

Removed:
    cocoon/trunk/blocks/cocoon-jfor/pom.xml
    cocoon/trunk/blocks/cocoon-jms/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/pom.xml
    cocoon/trunk/blocks/cocoon-lucene/pom.xml
Modified:
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
    cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
    cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
    cocoon/trunk/blocks/pom.xml

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-imageop</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-imageop-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Image Operation Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-imageop</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-imageop-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Image Operation Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-itext</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-itext-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Itext Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-itext/cocoon-itext-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-itext</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-itext-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Itext Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,22 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jfor</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jfor-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Jfor Block Implementation</name>
+  <packaging>jar</packaging>
 
   <repositories>
     <!-- Repository for the jfor -->
@@ -48,12 +50,10 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>jfor</groupId>
       <artifactId>jfor</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jfor</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jfor-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Jfor Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,43 +17,41 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jms</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jms-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
+  <name>JMS Block Implementation</name>
   <packaging>jar</packaging>
-  <name>Jms Block Implementation</name>
-  <description/>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-cron-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jms</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jms-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
+  <name>JMS Block Samples</name>
   <packaging>jar</packaging>
-  <name>Jms Block Samples</name>
-  <description/>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,39 +17,38 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jsp</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jsp-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jsp Block Implementation</name>
-  <description/>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jsp-mocks</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-mocks/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,28 +17,29 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jsp</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jsp-mocks</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jsp Block Mocks</name>
-  <description/>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jsp/cocoon-jsp-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-jsp</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-jsp-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Jsp Block Samples</name>
-  <description/>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-impl/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-lucene</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-lucene-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Lucene Block Implementation</name>
-  
+  <packaging>jar</packaging>
+
   <distributionManagement>
     <site>
       <id>website</id>
@@ -80,5 +82,4 @@
       </build>      
     </profile>
   </profiles>  
-  
 </project>

Modified: cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-lucene/cocoon-lucene-sample/pom.xml Wed Oct  3 02:48:30 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-lucene</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-lucene-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Lucene Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=581543&r1=581542&r2=581543&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Wed Oct  3 02:48:30 2007
@@ -128,7 +128,8 @@
         <module>cocoon-auth/cocoon-auth-api</module>
         <module>cocoon-auth/cocoon-auth-impl</module>
         <module>cocoon-auth/cocoon-auth-sample</module>        
-        <module>cocoon-authentication-fw</module>
+        <module>cocoon-authentication-fw/cocoon-authentication-fw-impl</module>
+        <module>cocoon-authentication-fw/cocoon-authentication-fw-sample</module>
         <module>cocoon-axis/cocoon-axis-impl</module>
         <module>cocoon-axis/cocoon-axis-sample</module>
         <module>cocoon-bsf/cocoon-bsf-impl</module>
@@ -159,15 +160,22 @@
         <module>cocoon-fop/cocoon-fop-ng-sample</module>
         <module>cocoon-html/cocoon-html-impl</module>
         <module>cocoon-html/cocoon-html-sample</module>        
-        <module>cocoon-imageop</module>  
-        <module>cocoon-itext</module>
+        <module>cocoon-imageop/cocoon-imageop-impl</module>
+        <module>cocoon-imageop/cocoon-imageop-sample</module>
+        <module>cocoon-itext/cocoon-itext-impl</module>
+        <module>cocoon-itext/cocoon-itext-sample</module>
         <module>cocoon-javaflow/cocoon-javaflow-impl</module>
         <module>cocoon-javaflow/cocoon-javaflow-sample</module>
         <!-- module>cocoon-jcr</module -->
-        <module>cocoon-jfor</module>
-        <module>cocoon-jms</module>
-        <module>cocoon-jsp</module>
-        <module>cocoon-lucene</module>
+        <module>cocoon-jfor/cocoon-jfor-impl</module>
+        <module>cocoon-jfor/cocoon-jfor-sample</module>
+        <module>cocoon-jms/cocoon-jms-impl</module>
+        <module>cocoon-jms/cocoon-jms-sample</module>
+        <module>cocoon-jsp/cocoon-jsp-impl</module>
+        <module>cocoon-jsp/cocoon-jsp-mocks</module>
+        <module>cocoon-jsp/cocoon-jsp-sample</module>
+        <module>cocoon-lucene/cocoon-lucene-impl</module>
+        <module>cocoon-lucene/cocoon-lucene-sample</module>
         <module>cocoon-mail/cocoon-mail-impl</module>
         <module>cocoon-mail/cocoon-mail-sample</module>        
         <module>cocoon-midi</module>