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/10/03 10:58:15 UTC
svn commit: r581532 - in /cocoon/trunk/blocks: ./ cocoon-asciiart/
cocoon-asciiart/cocoon-asciiart-impl/
cocoon-asciiart/cocoon-asciiart-sample/ cocoon-axis/
cocoon-axis/cocoon-axis-impl/ cocoon-axis/cocoon-axis-sample/ cocoon-bsf/
cocoon-bsf/cocoon-bs...
Author: vgritsenko
Date: Wed Oct 3 01:58:13 2007
New Revision: 581532
URL: http://svn.apache.org/viewvc?rev=581532&view=rev
Log:
more flattening
Removed:
cocoon/trunk/blocks/cocoon-asciiart/pom.xml
cocoon/trunk/blocks/cocoon-axis/pom.xml
cocoon/trunk/blocks/cocoon-bsf/pom.xml
cocoon/trunk/blocks/cocoon-captcha/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml
cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
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-asciiart/cocoon-asciiart-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-impl/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,23 +17,25 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-asciiart</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-asciiart-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Asciiart Block Implementation</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-asciiart/cocoon-asciiart-sample/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,23 +17,25 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-asciiart</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-asciiart-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Asciiart Block Samples</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-impl/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,48 +17,45 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-axis</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-axis-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Axis Block Implementation</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-saaj</artifactId>
-
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
-
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-axis/cocoon-axis-sample/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,28 +17,29 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-axis</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-axis-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Axis Block Samples</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-axis-impl</artifactId>
-
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,23 +17,25 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-bsf</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-bsf-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Bsf Block Implementation</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,23 +17,25 @@
specific language governing permissions and limitations
under the License.
-->
-<!--+
- | @version $Id$
- |
- +-->
+
+<!--
+ - @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-bsf</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-bsf-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
<name>Bsf Block Samples</name>
- <description/>
+ <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,14 +17,13 @@
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>
<groupId>org.apache.cocoon</groupId>
@@ -36,7 +35,8 @@
<version>1.0.0-RC3-SNAPSHOT</version>
<name>Cocoon Captcha Block Implementation</name>
<url>http://cocoon.apache.org/${docs.m.captcha.relPath}</url>
-
+ <packaging>jar</packaging>
+
<distributionManagement>
<site>
<id>website</id>
Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml Wed Oct 3 01:58:13 2007
@@ -17,11 +17,11 @@
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>
@@ -46,5 +46,4 @@
<artifactId>cocoon-samples-style-default</artifactId>
</dependency>
</dependencies>
-
</project>
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=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Wed Oct 3 01:58:13 2007
@@ -31,7 +31,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xsp-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>XSP Block Implementation</name>
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=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-sample/pom.xml Wed Oct 3 01:58:13 2007
@@ -31,7 +31,6 @@
<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>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=581532&r1=581531&r2=581532&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Wed Oct 3 01:58:13 2007
@@ -21,9 +21,7 @@
<!--
- @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>
@@ -124,14 +122,17 @@
</property>
</activation>
<modules>
- <module>cocoon-asciiart</module>
+ <module>cocoon-asciiart/cocoon-asciiart-impl</module>
+ <module>cocoon-asciiart/cocoon-asciiart-sample</module>
<module>cocoon-auth/cocoon-acegisecurity-sample</module>
<module>cocoon-auth/cocoon-auth-api</module>
<module>cocoon-auth/cocoon-auth-impl</module>
<module>cocoon-auth/cocoon-auth-sample</module>
<module>cocoon-authentication-fw</module>
- <module>cocoon-axis</module>
- <module>cocoon-bsf</module>
+ <module>cocoon-axis/cocoon-axis-impl</module>
+ <module>cocoon-axis/cocoon-axis-sample</module>
+ <module>cocoon-bsf/cocoon-bsf-impl</module>
+ <module>cocoon-bsf/cocoon-bsf-sample</module>
<module>cocoon-captcha/cocoon-captcha-impl</module>
<module>cocoon-captcha/cocoon-captcha-sample</module>
<module>cocoon-chaperon</module>