You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/03/30 15:11:44 UTC

svn commit: r390115 - in /cocoon/trunk: ./ blocks-tobeconverted/ blocks-tobeconverted/cocoon-ajax/ blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/ blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/ blocks-tobeconverted/cocoon-forms/ blocks-tobecon...

Author: reinhard
Date: Thu Mar 30 05:11:41 2006
New Revision: 390115

URL: http://svn.apache.org/viewcvs?rev=390115&view=rev
Log:
get cocon-core, forms and ajax compiling again

Added:
    cocoon/trunk/blocks-tobeconverted/pom.xml   (with props)
    cocoon/trunk/core/pom.xml   (with props)
Modified:
    cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/pom.xml
    cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/pom.xml
    cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml
    cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
    cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
    cocoon/trunk/blocks/cocoon-apples/pom.xml
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-impl/pom.xml Thu Mar 30 05:11:41 2006
@@ -22,11 +22,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ajax</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-ajax-impl</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ajax Block Implementation</name>
   <dependencies>

Modified: cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-ajax/cocoon-ajax-sample/pom.xml Thu Mar 30 05:11:41 2006
@@ -22,11 +22,11 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-ajax</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-ajax-sample</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ajax Block Sample</name>
   <dependencies>

Modified: cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml Thu Mar 30 05:11:41 2006
@@ -18,7 +18,10 @@
     | @version $Id$
     |
     +-->
-<project>
+<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">
   <parent>
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
@@ -29,7 +32,7 @@
   <artifactId>cocoon-ajax</artifactId>
   <packaging>pom</packaging>
   <name>Ajax Block</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <modules>
     <module>cocoon-ajax-impl</module>
     <module>cocoon-ajax-sample</module>

Modified: cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-impl/pom.xml Thu Mar 30 05:11:41 2006
@@ -18,15 +18,18 @@
     | @version $Id$
     |
     +-->
-<project>
+<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">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-forms</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-forms-impl</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Forms Block Implementation</name>
   <dependencies>
@@ -40,11 +43,12 @@
       <artifactId>cocoon-core</artifactId>
       <version>2.2.0-SNAPSHOT</version>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ajax-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>daisy</groupId>

Modified: cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml Thu Mar 30 05:11:41 2006
@@ -18,7 +18,10 @@
     | @version $Id$
     |
     +-->
-<project>
+<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">
   <parent>
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
@@ -29,7 +32,7 @@
   <artifactId>cocoon-forms</artifactId>
   <packaging>pom</packaging>
   <name>Forms Block</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <modules>
     <module>cocoon-forms-impl</module>
     <module>cocoon-forms-sample</module>

Added: cocoon/trunk/blocks-tobeconverted/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/pom.xml?rev=390115&view=auto
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/pom.xml (added)
+++ cocoon/trunk/blocks-tobeconverted/pom.xml Thu Mar 30 05:11:41 2006
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+    | @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>  
+  
+  <packaging>pom</packaging>  
+  
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>x-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-blocks-tobeconverted-modules</artifactId>
+    
+  <name>Cocoon Blocks (not converted yet!) [modules]</name>
+
+  <modules>
+		<module>cocoon-ajax</module>
+		<!--
+		<module>cocoon-authentication-fw</module>
+		<module>cocoon-captcha</module>
+		<module>cocoon-core-components</module>
+		<module>cocoon-cron</module>
+		<module>cocoon-databases</module>
+		<module>cocoon-default</module>
+		-->
+		<module>cocoon-forms</module>
+		<!--module>cocoon-jcr</module>
+		<module>cocoon-mocks</module>
+		<module>cocoon-portal</module>
+		<module>cocoon-template</module>
+		<module>cocoon-validation</module>
+		<module>cocoon-xmldb</module-->
+	</modules>
+</project>

Propchange: cocoon/trunk/blocks-tobeconverted/pom.xml
------------------------------------------------------------------------------
    eol:style = native

Propchange: cocoon/trunk/blocks-tobeconverted/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-impl/pom.xml Thu Mar 30 05:11:41 2006
@@ -15,22 +15,28 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+ xmlns="http://maven.apache.org/POM/4.0.0" 
+ xmlns:fo="http://www.w3.org/1999/XSL/Format" 
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
+  
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-apples-impl</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>apples Block Implementation</name>
+  <name>Apples Block Implementation</name>
   <description/>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -40,7 +46,8 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-forms-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
+  
 </project>

Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Thu Mar 30 05:11:41 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,12 +27,12 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-apples</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-apples-sample</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
     
   <packaging>jar</packaging>
   <name>apples Block Samples</name>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-apples-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

Modified: cocoon/trunk/blocks/cocoon-apples/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-apples/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/pom.xml Thu Mar 30 05:11:41 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,21 +24,19 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>x-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-apples</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   
-  <name>apples Block</name>
-
-  <description></description>
+  <name>Cocoon Apples Block</name>
   
   <modules>
     <module>cocoon-apples-impl</module>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Mar 30 05:11:41 2006
@@ -24,64 +24,64 @@
   
   <modelVersion>4.0.0</modelVersion>  
   
+  <packaging>pom</packaging>  
+  
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>x-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.cocoon</groupId>
-  <artifactId>cocoon-blocks</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <artifactId>cocoon-blocks-modules</artifactId>
     
-  <packaging>pom</packaging>
-  <name>Cocoon Blocks</name>
+  <name>Cocoon Blocks [modules]</name>
 
   <modules>
-		<module>cocoon-apples</module>
-		<module>cocoon-asciiart</module>
-		<module>cocoon-axis</module>
-		<module>cocoon-batik</module>
-		<module>cocoon-bsf</module>
-		<module>cocoon-chaperon</module>
-		<module>cocoon-core-samples-additional</module>
-		<module>cocoon-core-samples-main</module>
-		<module>cocoon-deli</module>
-		<module>cocoon-eventcache</module>
-		<module>cocoon-faces</module>
-		<module>cocoon-fop</module>
-		<module>cocoon-hsqldb</module>
-		<module>cocoon-html</module>
-		<module>cocoon-itext</module>
-		<module>cocoon-javaflow</module>
-		<module>cocoon-jfor</module>
-		<module>cocoon-jms</module>
-		<module>cocoon-jsp</module>
-		<module>cocoon-linkrewriter</module>
-		<module>cocoon-lucene</module>
-		<module>cocoon-mail</module>
-		<module>cocoon-midi</module>
-		<module>cocoon-naming</module>
-		<module>cocoon-ojb</module>
-		<module>cocoon-paranoid</module>
-		<module>cocoon-petstore</module>
-		<module>cocoon-poi</module>
-		<module>cocoon-profiler</module>
-		<module>cocoon-proxy</module>
-		<module>cocoon-python</module>
-		<module>cocoon-qdox</module>
-		<module>cocoon-querybean</module>
-		<module>cocoon-repository</module>
-		<module>cocoon-scratchpad</module>
-		<module>cocoon-serializers</module>
-		<module>cocoon-slide</module>
-		<module>cocoon-slop</module>
-		<module>cocoon-stx</module>
-		<module>cocoon-taglib</module>
-		<module>cocoon-tour</module>
-		<module>cocoon-velocity</module>
-		<module>cocoon-web3</module>
-		<module>cocoon-webdav</module>
-		<module>cocoon-xsp</module>
+		<!--module>cocoon-apples</module-->
+		<!--module>cocoon-asciiart</module>
+		<module>cocoon-axis</module>
+		<module>cocoon-batik</module>
+		<module>cocoon-bsf</module>
+		<module>cocoon-chaperon</module>
+		<module>cocoon-core-samples-additional</module>
+		<module>cocoon-core-samples-main</module>
+		<module>cocoon-deli</module>
+		<module>cocoon-eventcache</module>
+		<module>cocoon-faces</module>
+		<module>cocoon-fop</module>
+		<module>cocoon-hsqldb</module>
+		<module>cocoon-html</module>
+		<module>cocoon-itext</module>
+		<module>cocoon-javaflow</module>
+		<module>cocoon-jfor</module>
+		<module>cocoon-jms</module>
+		<module>cocoon-jsp</module>
+		<module>cocoon-linkrewriter</module>
+		<module>cocoon-lucene</module>
+		<module>cocoon-mail</module>
+		<module>cocoon-midi</module>
+		<module>cocoon-naming</module>
+		<module>cocoon-ojb</module>
+		<module>cocoon-paranoid</module>
+		<module>cocoon-petstore</module>
+		<module>cocoon-poi</module>
+		<module>cocoon-profiler</module>
+		<module>cocoon-proxy</module>
+		<module>cocoon-python</module>
+		<module>cocoon-qdox</module>
+		<module>cocoon-querybean</module>
+		<module>cocoon-repository</module>
+		<module>cocoon-scratchpad</module>
+		<module>cocoon-serializers</module>
+		<module>cocoon-slide</module>
+		<module>cocoon-slop</module>
+		<module>cocoon-stx</module>
+		<module>cocoon-taglib</module>
+		<module>cocoon-tour</module>
+		<module>cocoon-velocity</module>
+		<module>cocoon-web3</module>
+		<module>cocoon-webdav</module>
+		<module>cocoon-xsp</module-->
 	</modules>
 </project>

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Mar 30 05:11:41 2006
@@ -20,15 +20,20 @@
   +-->
 <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>
+  
+  <packaging>jar</packaging>  
+  
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <artifactId>cocoon-core-modules</artifactId>
+    <version>x-SNAPSHOT</version>
   </parent>
+  
   <artifactId>cocoon-core</artifactId>
   <version>2.2.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+
   <name>Cocoon Core</name>
   <build>
     <plugins>

Added: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=390115&view=auto
==============================================================================
--- cocoon/trunk/core/pom.xml (added)
+++ cocoon/trunk/core/pom.xml Thu Mar 30 05:11:41 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+    | @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>  
+  
+  <packaging>pom</packaging>  
+  
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>x-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-core-modules</artifactId>
+    
+  <name>Cocoon Core [modules]</name>
+
+  <modules>
+		<module>cocoon-core</module>
+	</modules>
+</project>

Propchange: cocoon/trunk/core/pom.xml
------------------------------------------------------------------------------
    eol:style = native

Propchange: cocoon/trunk/core/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=390115&r1=390114&r2=390115&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu Mar 30 05:11:41 2006
@@ -15,15 +15,22 @@
   limitations under the License.
 -->
 <!--+
-    | This is the main Maven file
+    | This is the main Maven file that contains all global settings, *management and information.
     | @version $Id$
     +-->
-<project>
+<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>
+  
+  <packaging>pom</packaging>  
+  
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon</artifactId>
-  <packaging>pom</packaging>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>x-SNAPSHOT</version>
+  
   <name>Apache Cocoon</name>
   <url>http://cocoon.apache.org</url>
   <licenses>
@@ -33,29 +40,15 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+  
   <modules>
-    <module>cocoon-archetypes</module>
-    <module>cocoon-core</module>
-    <module>cocoon-block-deployer</module>
-    <module>cocoon-blocks-fw</module>
-    <module>cocoon-default</module>    
-    <module>cocoon-mocks</module>
-    <!--  Blocks  -->
-    <module>cocoon-ajax</module>
-    <module>cocoon-authentication-fw</module>
-    <module>cocoon-captcha</module>
-    <module>cocoon-cron</module>
-    <module>cocoon-databases</module>
-    <module>cocoon-forms</module>
-    <module>cocoon-core-components</module>    
-    <!--module>cocoon-jcr</module> -->
-    <module>cocoon-portal</module>
-    <module>cocoon-session-fw</module>
-    <module>cocoon-sitemap</module>
-    <module>cocoon-template</module>
-    <module>cocoon-validation</module>
-    <!--module>cocoon-xmldb</module-->
-    <module>cocoon-webapp</module>
+    <module>blocks</module>
+    <module>blocks-tobeconverted</module>    
+    <!--
+    <module>commons</module-->
+    <module>core</module>
+    <!--module>tools</module-->
+    
   </modules>
   <repositories>
     <repository>
@@ -75,8 +68,7 @@
       <url>http://snapshots.maven.codehaus.org/maven2/</url>
     </repository>
   </repositories>
-  <!--
-    Activate this element if you want to use snapshot versions of plugins
+  <!-- Activate this element if you want to use snapshot versions of plugins
   <pluginRepositories>
     <pluginRepository>
       <id>snapshots</id>