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/09/29 17:57:14 UTC
svn commit: r580601 - in /cocoon/trunk/blocks:
cocoon-xsp/cocoon-xsp-impl/pom.xml cocoon-xsp/cocoon-xsp-sample/pom.xml
cocoon-xsp/pom.xml pom.xml
Author: vgritsenko
Date: Sat Sep 29 08:57:13 2007
New Revision: 580601
URL: http://svn.apache.org/viewvc?rev=580601&view=rev
Log:
attempt to flatten cocoon-xsp blocks
Removed:
cocoon/trunk/blocks/cocoon-xsp/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=580601&r1=580600&r2=580601&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Sat Sep 29 08:57:13 2007
@@ -17,23 +17,28 @@
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">
+
+<!--
+ - @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-xsp</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-xsp-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <name>XSP Block Implementation</name>
<packaging>jar</packaging>
- <name>Xsp Block Implementation</name>
- <description/>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml?rev=580601&r1=580600&r2=580601&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml Sat Sep 29 08:57:13 2007
@@ -17,23 +17,28 @@
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">
+
+<!--
+ - @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-xsp</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-xsp-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <name>XSP Block Samples</name>
<packaging>jar</packaging>
- <name>Xsp Block Samples</name>
- <description/>
+
<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=580601&r1=580600&r2=580601&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Sat Sep 29 08:57:13 2007
@@ -17,22 +17,26 @@
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">
-
+
+<!--
+ - @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>6-SNAPSHOT</version>
</parent>
+
<artifactId>cocoon-blocks-modules</artifactId>
<version>6-SNAPSHOT</version>
<name>Cocoon Blocks [modules]</name>
-
+ <packaging>pom</packaging>
+
<build>
<plugins>
<plugin>
@@ -185,7 +189,8 @@
<module>cocoon-web3</module>
<module>cocoon-webdav</module>
<module>cocoon-xmldb</module>
- <module>cocoon-xsp</module>
+ <module>cocoon-xsp/cocoon-xsp-impl</module>
+ <module>cocoon-xsp/cocoon-xsp-sample</module>
</modules>
</profile>
</profiles>