You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2007/01/14 16:40:38 UTC
svn commit: r496090 - in /cocoon/trunk/core: cocoon-webapp/pom.xml pom.xml
Author: danielf
Date: Sun Jan 14 07:40:38 2007
New Revision: 496090
URL: http://svn.apache.org/viewvc?view=rev&rev=496090
Log:
Update the core pom to include the servlet-service modules and not include the blocks-fw demo and samples. Use the servlet-service samples in the cocoon-webapp. The samples seem to work.
Modified:
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/core/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=496090&r1=496089&r2=496090
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Sun Jan 14 07:40:38 2007
@@ -66,6 +66,12 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-servlet-service-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-blocks-fw-impl</artifactId>
<version>1.0.0-M2-SNAPSHOT</version>
</dependency>
@@ -95,17 +101,7 @@
<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>
+ <artifactId>cocoon-servlet-service-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=496090&r1=496089&r2=496090
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Sun Jan 14 07:40:38 2007
@@ -35,15 +35,14 @@
<modules>
<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/cocoon-configuration-api</module>
<module>cocoon-configuration/cocoon-spring-configurator</module>
<module>cocoon-core</module>
<module>cocoon-pipeline/cocoon-pipeline-api</module>
<module>cocoon-pipeline/cocoon-pipeline-impl</module>
<module>cocoon-pipeline/cocoon-pipeline-components</module>
+ <module>cocoon-servlet-service/cocoon-servlet-service-impl</module>
+ <module>cocoon-servlet-service/cocoon-servlet-service-sample</module>
<module>cocoon-sitemap/cocoon-sitemap-api</module>
<module>cocoon-sitemap/cocoon-sitemap-impl</module>
<module>cocoon-sitemap/cocoon-sitemap-components</module>