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/02/15 21:11:20 UTC
svn commit: r508117 - in /cocoon/trunk/blocks: ./ cocoon-databases/
cocoon-databases/cocoon-databases-hsqldb-client/
cocoon-databases/cocoon-databases-hsqldb-server/
cocoon-databases/cocoon-databases-impl/
cocoon-databases/cocoon-databases-mocks/ cocoo...
Author: reinhard
Date: Thu Feb 15 12:11:19 2007
New Revision: 508117
URL: http://svn.apache.org/viewvc?view=rev&rev=508117
Log:
flatten pom hierarchy
Removed:
cocoon/trunk/blocks/cocoon-databases/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Thu Feb 15 12:11:19 2007
@@ -22,18 +22,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">
+
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-hsqldb-client</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Hsqldb client Implementation</name>
- <description/>
+ <name>Cocoon Hsqldb client Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -46,4 +48,5 @@
<version>1.8.0.7</version>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-server/pom.xml Thu Feb 15 12:11:19 2007
@@ -21,18 +21,21 @@
| @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>jar</packaging>
+
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-hsqldb-server</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Hsqldb Block Implementation</name>
- <description/>
+ <name>Cocoon Hsqldb Block Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -56,4 +59,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Thu Feb 15 12:11:19 2007
@@ -22,16 +22,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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-databases-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Database Block Implementation</name>
+ <name>Cocoon Database Block Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -108,4 +112,5 @@
</exclusions>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-mocks/pom.xml Thu Feb 15 12:11:19 2007
@@ -22,14 +22,18 @@
|
+-->
<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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-databases-mocks</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Database Block Mocks</name>
+ <name>Cocoon Database Block Mocks</name>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-odbc-client/pom.xml Thu Feb 15 12:11:19 2007
@@ -22,18 +22,22 @@
|
+-->
<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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-odbc-client</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Odbc client Implementation</name>
- <description/>
+
+ <name>Cocoon ODBC client Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-oracle-client/pom.xml Thu Feb 15 12:11:19 2007
@@ -19,21 +19,23 @@
-->
<!--+
| @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>jar</packaging>
+
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-oracle-client</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Oracle client Implementation</name>
- <description/>
+ <name>Cocoon Oracle client Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-postgresql-client/pom.xml Thu Feb 15 12:11:19 2007
@@ -22,18 +22,21 @@
|
+-->
<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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-databases-postgresql-client</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>PostgreSQL client Implementation</name>
- <description/>
+ <name>Cocoon PostgreSQL client Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -41,4 +44,5 @@
<version>1.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-sample/pom.xml Thu Feb 15 12:11:19 2007
@@ -19,19 +19,22 @@
-->
<!--+
| @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>jar</packaging>
+
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases</artifactId>
- <version>1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>#
<artifactId>cocoon-databases-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Databases Block's Samples</name>
+ <name>Cocoon Databases Block Samples</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -49,4 +52,5 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=508117&r1=508116&r2=508117
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Feb 15 12:11:19 2007
@@ -81,7 +81,14 @@
<module>cocoon-captcha/cocoon-captcha-sample</module>
<module>cocoon-chaperon</module>
<module>cocoon-cron</module>
- <module>cocoon-databases</module>
+ <module>cocoon-databases/cocoon-databases-impl</module>
+ <module>cocoon-databases/cocoon-databases-mocks</module>
+ <module>cocoon-databases/cocoon-databases-sample</module>
+ <module>cocoon-databases/cocoon-databases-hsqldb-client</module>
+ <module>cocoon-databases/cocoon-databases-hsqldb-server</module>
+ <module>cocoon-databases/cocoon-databases-odbc-client</module>
+ <module>cocoon-databases/cocoon-databases-oracle-client</module>
+ <module>cocoon-databases/cocoon-databases-postgresql-client</module>
<module>cocoon-deli</module>
<module>cocoon-eventcache</module>
<module>cocoon-faces</module>