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:13:06 UTC
svn commit: r581537 - in /cocoon/trunk/blocks: ./ cocoon-chaperon/
cocoon-chaperon/cocoon-chaperon-impl/
cocoon-chaperon/cocoon-chaperon-sample/ cocoon-cron/
cocoon-cron/cocoon-cron-impl/ cocoon-cron/cocoon-cron-sample/ cocoon-deli/
cocoon-deli/cocoon-...
Author: vgritsenko
Date: Wed Oct 3 02:13:05 2007
New Revision: 581537
URL: http://svn.apache.org/viewvc?rev=581537&view=rev
Log:
flattening
Removed:
cocoon/trunk/blocks/cocoon-chaperon/pom.xml
cocoon/trunk/blocks/cocoon-cron/pom.xml
cocoon/trunk/blocks/cocoon-deli/pom.xml
cocoon/trunk/blocks/cocoon-eventcache/pom.xml
cocoon/trunk/blocks/cocoon-faces/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Wed Oct 3 02:13:05 2007
@@ -17,19 +17,20 @@
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-chaperon</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-chaperon-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml Wed Oct 3 02:13:05 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-chaperon</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-chaperon-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Chaperon Block Samples</name>
- <description/>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml Wed Oct 3 02:13:05 2007
@@ -17,18 +17,20 @@
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-cron</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-cron-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml Wed Oct 3 02:13:05 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-cron</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-cron-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cron Block Samples</name>
- <description/>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml Wed Oct 3 02:13:05 2007
@@ -17,18 +17,20 @@
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-deli</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-deli-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml Wed Oct 3 02:13:05 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-deli</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-deli-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Deli Block Samples</name>
- <description/>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml Wed Oct 3 02:13:05 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-eventcache</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-eventcache-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Eventcache Block Implementation</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml Wed Oct 3 02:13:05 2007
@@ -17,22 +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-eventcache</artifactId>
- <version>1-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-modules</artifactId>
+ <version>6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>cocoon-eventcache-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Eventcache Block Samples</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Wed Oct 3 02:13:05 2007
@@ -17,22 +17,23 @@
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-faces</artifactId>
<version>1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cocoon</groupId>
+
<artifactId>cocoon-faces-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Faces Block Implementation</name>
+ <packaging>jar</packaging>
<repositories>
<!-- Repository for the myfaces -->
Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml?rev=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml Wed Oct 3 02:13:05 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-faces</artifactId>
<version>1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.cocoon</groupId>
+
<artifactId>cocoon-faces-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Faces 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=581537&r1=581536&r2=581537&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Wed Oct 3 02:13:05 2007
@@ -135,8 +135,10 @@
<module>cocoon-bsf/cocoon-bsf-sample</module>
<module>cocoon-captcha/cocoon-captcha-impl</module>
<module>cocoon-captcha/cocoon-captcha-sample</module>
- <module>cocoon-chaperon</module>
- <module>cocoon-cron</module>
+ <module>cocoon-chaperon/cocoon-chaperon-impl</module>
+ <module>cocoon-chaperon/cocoon-chaperon-sample</module>
+ <module>cocoon-cron/cocoon-cron-impl</module>
+ <module>cocoon-cron/cocoon-cron-sample</module>
<module>cocoon-databases/cocoon-databases-impl</module>
<module>cocoon-databases/cocoon-databases-mocks</module>
<module>cocoon-databases/cocoon-databases-sample</module>
@@ -145,9 +147,12 @@
<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>
+ <module>cocoon-deli/cocoon-deli-impl</module>
+ <module>cocoon-deli/cocoon-deli-sample</module>
+ <module>cocoon-eventcache/cocoon-eventcache-impl</module>
+ <module>cocoon-eventcache/cocoon-eventcache-sample</module>
+ <module>cocoon-faces/cocoon-faces-impl</module>
+ <module>cocoon-faces/cocoon-faces-sample</module>
<module>cocoon-fop/cocoon-fop-impl</module>
<module>cocoon-fop/cocoon-fop-sample</module>
<module>cocoon-fop/cocoon-fop-ng-impl</module>