You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/10 20:22:44 UTC
svn commit: r393018 - in /cocoon/trunk/blocks: ./
cocoon-python/cocoon-python-impl/
cocoon-python/cocoon-python-mocks/src/main/java/mocks/
cocoon-repository/cocoon-repository-impl/ cocoon-scratchpad/
cocoon-scratchpad/cocoon-scratchpad-impl/ cocoon-scr...
Author: cziegeler
Date: Mon Apr 10 11:22:41 2006
New Revision: 393018
URL: http://svn.apache.org/viewcvs?rev=393018&view=rev
Log:
Fix poms - most blocks compile now
Removed:
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/src/main/java/org/apache/cocoon/generation/GarbageGenerator.java
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-mocks/
Modified:
cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/main/java/mocks/pom.xml
cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
cocoon/trunk/blocks/cocoon-scratchpad/pom.xml
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/pom.xml
cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/main/java/mocks/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml Mon Apr 10 11:22:41 2006
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-python-mocks</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/main/java/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/main/java/mocks/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/main/java/mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/src/main/java/mocks/pom.xml Mon Apr 10 11:22:41 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
|
+-->
<project>
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-python-mocks</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<sourceDirectory>.</sourceDirectory>
Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml Mon Apr 10 11:22:41 2006
@@ -46,6 +46,12 @@
<groupId>excalibur-datasource</groupId>
<artifactId>excalibur-datasource</artifactId>
<version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>d-haven-managed-pool</artifactId>
+ <groupId>d-haven-managed-pool</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml Mon Apr 10 11:22:41 2006
@@ -39,12 +39,12 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-cron</artifactId>
+ <artifactId>cocoon-cron-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-repository</artifactId>
+ <artifactId>cocoon-repository-impl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -62,25 +62,33 @@
<artifactId>commons-betwixt</artifactId>
<version>0.6</version>
</dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>excalibur-sourceresolve</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
<version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>d-haven-managed-pool</artifactId>
+ <groupId>d-haven-managed-pool</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>castor</groupId>
<artifactId>castor</artifactId>
<version>0.9.7</version>
</dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-scratchpad-garbage</artifactId>
- <version>2.2-SNAPSHOT</version>
- </dependency>
+<!--
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-test-core</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ -->
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-scratchpad/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-scratchpad/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/pom.xml Mon Apr 10 11:22:41 2006
@@ -43,6 +43,5 @@
<modules>
<module>cocoon-scratchpad-impl</module>
<module>cocoon-scratchpad-sample</module>
- <module>cocoon-scratchpad-mocks</module>
</modules>
</project>
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-impl/pom.xml Mon Apr 10 11:22:41 2006
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-web3-mocks</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/main/java/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/main/java/mocks/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/main/java/mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-web3/cocoon-web3-mocks/src/main/java/mocks/pom.xml Mon Apr 10 11:22:41 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
|
+-->
<project>
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-web3-mocks</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<sourceDirectory>.</sourceDirectory>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=393018&r1=393017&r2=393018&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Mon Apr 10 11:22:41 2006
@@ -75,11 +75,11 @@
<module>cocoon-portal</module>
<module>cocoon-profiler</module>
<module>cocoon-proxy</module>
- <module>cocoon-python</module>
+ <!-- module>cocoon-python</module -->
<module>cocoon-qdox</module>
<module>cocoon-querybean</module>
<module>cocoon-repository</module>
- <module>cocoon-scratchpad</module>
+ <!-- module>cocoon-scratchpad</module -->
<module>cocoon-serializers</module>
<module>cocoon-session-fw</module>
<module>cocoon-slide</module>
@@ -91,6 +91,6 @@
<module>cocoon-velocity</module>
<module>cocoon-web3</module>
<module>cocoon-webdav</module>
- <module>cocoon-xsp</module>
+ <!-- module>cocoon-xsp</module -->
</modules>
</project>