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 2006/10/12 23:21:21 UTC
svn commit: r463434 - in /cocoon/trunk: core/cocoon-webapp/pom.xml
dists/cocoon-dist-samples/pom.xml
Author: vgritsenko
Date: Thu Oct 12 14:21:19 2006
New Revision: 463434
URL: http://svn.apache.org/viewvc?view=rev&rev=463434
Log:
cleanup core webapp.
add samples to samples webapp.
Modified:
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/dists/cocoon-dist-samples/pom.xml
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=463434&r1=463433&r2=463434
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Thu Oct 12 14:21:19 2006
@@ -19,10 +19,14 @@
-->
<!--+
- | @version $Id$
+ | This is the bare bones Cocoon web application,
+ | basis for creation of custom distributions.
|
+ | @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">
+<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>
@@ -33,6 +37,7 @@
<version>2.2.0-M2-SNAPSHOT</version>
<packaging>war</packaging>
<name>Core Webapp</name>
+
<build>
<plugins>
<plugin>
@@ -71,7 +76,7 @@
</build>
<dependencies>
- <!-- Cocoon Core -->
+ <!-- Cocoon Core webapp depends only on Cocoon Core -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
@@ -82,69 +87,8 @@
<artifactId>cocoon-blocks-fw-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core-main-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Cocoon Sample Blocks -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-ajax-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-forms-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-template-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-demo1</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-demo2</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-fw-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
</dependencies>
- <profiles>
- <profile>
- <id>allblocks</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-xsp-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-portal-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<pluginRepositories>
<pluginRepository>
<id>snapshots</id>
Modified: cocoon/trunk/dists/cocoon-dist-samples/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/dists/cocoon-dist-samples/pom.xml?view=diff&rev=463434&r1=463433&r2=463434
==============================================================================
--- cocoon/trunk/dists/cocoon-dist-samples/pom.xml (original)
+++ cocoon/trunk/dists/cocoon-dist-samples/pom.xml Thu Oct 12 14:21:19 2006
@@ -72,6 +72,29 @@
<version>2.2.0-M2-SNAPSHOT</version>
</dependency>
+ <!-- Core Samples -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-core-main-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-blocks-fw-demo1</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-blocks-fw-demo2</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-blocks-fw-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Blocks Samples -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-ajax-sample</artifactId>
@@ -97,7 +120,31 @@
<artifactId>cocoon-template-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!-- Many of old samples require XSP -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xsp-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>allblocks</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-databases-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-portal-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<pluginRepositories>
<pluginRepository>