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 2006/03/30 16:12:38 UTC
svn commit: r390139 - in /cocoon/trunk: blocks-tobeconverted/pom.xml
core/cocoon-blocks-fw/cocoon-default/pom.xml core/cocoon-blocks-fw/pom.xml
core/pom.xml tools/cocoon-block-deployer/pom.xml tools/pom.xml
Author: reinhard
Date: Thu Mar 30 06:12:35 2006
New Revision: 390139
URL: http://svn.apache.org/viewcvs?rev=390139&view=rev
Log:
make cocoon-webapp running again together with the cocoon-deployer
Added:
cocoon/trunk/tools/pom.xml (with props)
Modified:
cocoon/trunk/blocks-tobeconverted/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/pom.xml
cocoon/trunk/core/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/pom.xml
Modified: cocoon/trunk/blocks-tobeconverted/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/pom.xml?rev=390139&r1=390138&r2=390139&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/pom.xml Thu Mar 30 06:12:35 2006
@@ -45,8 +45,7 @@
<module>cocoon-core-components</module>
<module>cocoon-cron</module>
<module>cocoon-databases</module>
- -->
- <module>cocoon-default</module>
+ -->
<module>cocoon-forms</module>
<!--module>cocoon-jcr</module>
<module>cocoon-mocks</module>
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml?rev=390139&r1=390138&r2=390139&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-default/pom.xml Thu Mar 30 06:12:35 2006
@@ -19,12 +19,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks-tobeconverted-modules</artifactId>
+ <artifactId>cocoon-blocks-fw</artifactId>
<version>x-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
- <name>cocoon-default</name>
+ <name>Cocoon default (all blocks to run blocks-fw)</name>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-default</artifactId>
Modified: cocoon/trunk/core/cocoon-blocks-fw/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-blocks-fw/pom.xml?rev=390139&r1=390138&r2=390139&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/pom.xml Thu Mar 30 06:12:35 2006
@@ -20,19 +20,21 @@
+-->
<project>
<parent>
- <artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-blocks-fw</artifactId>
<packaging>pom</packaging>
<name>Blocks Framework</name>
- <version>1.0-SNAPSHOT</version>
<modules>
+ <!--
<module>cocoon-blocks-fw-impl</module>
<module>cocoon-blocks-fw-ecm-impl</module>
<module>cocoon-blocks-fw-servlet-impl</module>
<module>cocoon-blocks-fw-sample</module>
+ -->
+ <module>cocoon-default</module>
</modules>
</project>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=390139&r1=390138&r2=390139&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Thu Mar 30 06:12:35 2006
@@ -38,7 +38,7 @@
<name>Cocoon Core [modules]</name>
<modules>
- <!-- module>cocoon-blocks-fw</module>-->
+ <module>cocoon-blocks-fw</module>
<module>cocoon-core</module>
<module>cocoon-webapp</module>
</modules>
Modified: cocoon/trunk/tools/cocoon-block-deployer/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/pom.xml?rev=390139&r1=390138&r2=390139&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/pom.xml Thu Mar 30 06:12:35 2006
@@ -33,7 +33,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Cocoon Deployer - Projects</name>
+ <name>Cocoon Deployer [modules]</name>
<modules>
<module>cocoon-deployer-core</module>
Added: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/pom.xml?rev=390139&view=auto
==============================================================================
--- cocoon/trunk/tools/pom.xml (added)
+++ cocoon/trunk/tools/pom.xml Thu Mar 30 06:12:35 2006
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--+
+ | @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>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>x-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-tools-modules</artifactId>
+
+ <name>Cocoon Tools [modules]</name>
+
+ <modules>
+ <module>cocoon-block-deployer</module>
+ </modules>
+</project>
Propchange: cocoon/trunk/tools/pom.xml
------------------------------------------------------------------------------
eol:style = native
Propchange: cocoon/trunk/tools/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: cocoon/trunk/tools/pom.xml
------------------------------------------------------------------------------
svn:keywords = id