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 18:36:49 UTC
svn commit: r580603 - in /cocoon/trunk/blocks: ./
cocoon-forms/cocoon-forms-sample/ cocoon-javaflow/
cocoon-javaflow/cocoon-javaflow-impl/ cocoon-javaflow/cocoon-javaflow-sample/
cocoon-template/cocoon-template-impl/
Author: vgritsenko
Date: Sat Sep 29 09:36:48 2007
New Revision: 580603
URL: http://svn.apache.org/viewvc?rev=580603&view=rev
Log:
fix javaflow compilation error.
flatten javaflow.
Removed:
cocoon/trunk/blocks/cocoon-javaflow/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/pom.xml?rev=580603&r1=580602&r2=580603&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/pom.xml Sat Sep 29 09:36:48 2007
@@ -17,13 +17,14 @@
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>jar</packaging>
<parent>
<artifactId>cocoon-blocks-modules</artifactId>
@@ -31,9 +32,11 @@
<version>6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>cocoon-forms-sample</artifactId>
<version>1.1.0-SNAPSHOT</version>
<name>Cocoon Forms Block Samples</name>
+ <packaging>jar</packaging>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml?rev=580603&r1=580602&r2=580603&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/pom.xml Sat Sep 29 09:36:48 2007
@@ -17,23 +17,27 @@
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>jar</packaging>
-
+
+<!--
+ - @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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-javaflow</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-javaflow-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>Javaflow Block</name>
+ <packaging>jar</packaging>
<distributionManagement>
<site>
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml?rev=580603&r1=580602&r2=580603&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/pom.xml Sat Sep 29 09:36:48 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>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-javaflow</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-javaflow-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Javaflow Block Samples</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -49,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-forms-impl</artifactId>
+ <artifactId>cocoon-forms-sample</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?rev=580603&r1=580602&r2=580603&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Sat Sep 29 09:36:48 2007
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
- <packaging>jar</packaging>
<parent>
- <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-blocks-modules</artifactId>
<version>6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+
<artifactId>cocoon-template-impl</artifactId>
<version>1.0.0-RC3-SNAPSHOT</version>
<name>Cocoon Template Framework Block Implementation</name>
<url>http://cocoon.apache.org/${docs.m.template.relPath}</url>
-
+ <packaging>jar</packaging>
+
<distributionManagement>
<site>
<id>website</id>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=580603&r1=580602&r2=580603&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Sat Sep 29 09:36:48 2007
@@ -155,7 +155,8 @@
<module>cocoon-html/cocoon-html-sample</module>
<module>cocoon-imageop</module>
<module>cocoon-itext</module>
- <module>cocoon-javaflow</module>
+ <module>cocoon-javaflow/cocoon-javaflow-impl</module>
+ <module>cocoon-javaflow/cocoon-javaflow-sample</module>
<!-- module>cocoon-jcr</module -->
<module>cocoon-jfor</module>
<module>cocoon-jms</module>