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 2007/01/03 20:02:52 UTC
svn commit: r492254 - in /cocoon/trunk/core: ./ cocoon-configuration/
cocoon-configuration/cocoon-configuration-api/
cocoon-configuration/cocoon-spring-configurator/ cocoon-pipeline/
cocoon-pipeline/cocoon-pipeline-api/ cocoon-pipeline/cocoon-pipeline-...
Author: reinhard
Date: Wed Jan 3 11:02:50 2007
New Revision: 492254
URL: http://svn.apache.org/viewvc?view=rev&rev=492254
Log:
flattening rest of core
Removed:
cocoon/trunk/core/cocoon-configuration/pom.xml
cocoon/trunk/core/cocoon-pipeline/pom.xml
cocoon/trunk/core/cocoon-sitemap/pom.xml
cocoon/trunk/core/cocoon-store/pom.xml
cocoon/trunk/core/cocoon-thread/pom.xml
cocoon/trunk/core/cocoon-xml/pom.xml
Modified:
cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
cocoon/trunk/core/pom.xml
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-configuration</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-configuration-api</artifactId>
Modified: cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml (original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-spring-configurator/pom.xml Wed Jan 3 11:02:50 2007
@@ -24,13 +24,14 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<parent>
+ <artifactId>cocoon-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-configuration</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cocoon-spring-configurator</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Spring</name>
+ <name>Cocoon Spring Configurator</name>
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,14 +23,15 @@
<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>
+ <artifactId>cocoon-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-pipeline</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>cocoon-pipeline-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Pipeline API</name>
+ <name>Cocoon Pipeline API</name>
<dependencies>
<!-- Excalibur -->
@@ -109,13 +110,14 @@
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
-
+ <!-- Servlet API -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-pipeline</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-pipeline-components</artifactId>
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=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-pipeline</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-pipeline-impl</artifactId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-sitemap-api</artifactId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-sitemap-components</artifactId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-sitemap-impl</artifactId>
Modified: cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-store</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-store-impl</artifactId>
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Wed Jan 3 11:02:50 2007
@@ -33,7 +33,7 @@
<artifactId>cocoon-webapp</artifactId>
<version>2.2.0-M2-SNAPSHOT</version>
<packaging>war</packaging>
- <name>Core Webapp</name>
+ <name>Cocoon Webapp</name>
<build>
<plugins>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xml</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-xml-api</artifactId>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xml</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-xml-impl</artifactId>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml Wed Jan 3 11:02:50 2007
@@ -23,9 +23,10 @@
+-->
<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-core-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xml</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-xml-resolver</artifactId>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=492254&r1=492253&r2=492254
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Wed Jan 3 11:02:50 2007
@@ -35,17 +35,24 @@
<module>cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
<module>cocoon-blocks-fw/cocoon-blocks-fw-demo1</module>
<module>cocoon-blocks-fw/cocoon-blocks-fw-demo2</module>
- <module>cocoon-blocks-fw/cocoon-blocks-fw-sample</module>
-
- <module>cocoon-configuration</module>
+ <module>cocoon-blocks-fw/cocoon-blocks-fw-sample</module>
+ <module>cocoon-configuration/cocoon-configuration-api</module>
+ <module>cocoon-configuration/cocoon-spring-configurator</module>
<module>cocoon-core</module>
- <module>cocoon-pipeline</module>
- <module>cocoon-sitemap</module>
- <module>cocoon-store</module>
- <module>cocoon-thread</module>
+ <module>cocoon-pipeline/cocoon-pipeline-api</module>
+ <module>cocoon-pipeline/cocoon-pipeline-impl</module>
+ <module>cocoon-pipeline/cocoon-pipeline-components</module>
+ <module>cocoon-sitemap/cocoon-sitemap-api</module>
+ <module>cocoon-sitemap/cocoon-sitemap-impl</module>
+ <module>cocoon-sitemap/cocoon-sitemap-components</module>
+ <module>cocoon-store/cocoon-store-impl</module>
+ <module>cocoon-thread/cocoon-thread-api</module>
+ <module>cocoon-thread/cocoon-thread-impl</module>
<module>cocoon-util</module>
<module>cocoon-webapp</module>
- <module>cocoon-xml</module>
+ <module>cocoon-xml/cocoon-xml-api</module>
+ <module>cocoon-xml/cocoon-xml-impl</module>
+ <module>cocoon-xml/cocoon-xml-resolver</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/core</connection>