Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 46229 invoked from network); 14 Dec 2005 08:59:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Dec 2005 08:59:39 -0000 Received: (qmail 82315 invoked by uid 500); 14 Dec 2005 08:59:37 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 82164 invoked by uid 500); 14 Dec 2005 08:59:36 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 82151 invoked by uid 99); 14 Dec 2005 08:59:36 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2005 00:59:36 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,USERPASS X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 14 Dec 2005 00:59:34 -0800 Received: (qmail 45976 invoked by uid 65534); 14 Dec 2005 08:59:14 -0000 Message-ID: <20051214085913.45974.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r356754 - in /cocoon/whiteboard/maven2/cocoon-flat-layout/trunk: ./ cocoon-ajax/ cocoon-ajax/api/ cocoon-ajax/impl/ cocoon-ajax/samples/ cocoon-asciiart/ cocoon-asciiart/impl/ cocoon-asciiart/samples/ cocoon-core/ cocoon-forms/ cocoon-forms... Date: Wed, 14 Dec 2005 08:59:05 -0000 To: cvs@cocoon.apache.org From: jheymans@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jheymans Date: Wed Dec 14 00:58:51 2005 New Revision: 356754 URL: http://svn.apache.org/viewcvs?rev=356754&view=rev Log: using new excalibur libs, tweaked versions a bit, removed many exclusions in core Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/api/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/impl/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/samples/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/impl/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/samples/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-core/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/api/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/impl/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/samples/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-mocks/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/pom.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/settings.xml cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/webapp/pom.xml Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/api/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/api/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/api/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/api/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,12 +1,12 @@ cocoon-ajax - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.ajax + 1.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-api Ajax API - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/impl/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/impl/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/impl/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/impl/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,24 +1,24 @@ cocoon-ajax - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.ajax + 1.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-impl Ajax Implementation - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-api - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT - apache-cocoon + org.apache.cocoon cocoon-core - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,15 +1,15 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax pom Ajax Block - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT api impl Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/samples/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/samples/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/samples/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-ajax/samples/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,19 +1,19 @@ cocoon-ajax - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.ajax + 1.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-samples Ajax Samples - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-impl - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/impl/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/impl/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/impl/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/impl/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,19 +1,19 @@ cocoon-asciiart - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.asciiart + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.asciiart cocoon-asciiart-impl Ascii Art Implementation - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT - apache-cocoon + org.apache.cocoon cocoon-core - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,15 +1,15 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.asciiart cocoon-asciiart pom Ascii Art Block - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT impl samples Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/samples/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/samples/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/samples/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-asciiart/samples/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,19 +1,19 @@ cocoon-asciiart - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.asciiart + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.asciiart cocoon-asciiart-samples Asciiart Samples - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT - apache-cocoon + org.apache.cocoon.asciiart cocoon-asciiart-impl - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-core/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-core/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-core/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-core/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,14 +1,13 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon cocoon-core Cocoon Core - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT @@ -37,7 +36,9 @@ **/SitemapTestCase* **/ContainerTestCase* **/CocoonTestCase* - **/VirtualPipelineGeneratorTestCase* + + **/VirtualPipelineGeneratorTestCase* + @@ -50,17 +51,82 @@ - - junit - junit - 3.8.1 - test - + jakarta-bcel jakarta-bcel 20040329 + + + + + org.apache.excalibur.components.pool + excalibur-pool-impl + 2.1 + + + org.apache.excalibur.components.sourceresolve + excalibur-sourceresolve + 2.1 + + + org.apache.excalibur.containerkit.logger + excalibur-logger + 2.1 + + + org.apache.excalibur.components.pool + excalibur-pool-instrumented + 2.1 + + + org.apache.excalibur.components.store + excalibur-store + 2.1 + + + org.apache.excalibur.containerkit.instrument + excalibur-instrument-api + 2.1 + + + org.apache.excalibur.components.xmlutil + excalibur-xmlutil + 2.1 + + + avalon-framework + avalon-framework-impl + 4.3 + + + excalibur-io + excalibur-io + 1.1 + + + excalibur-naming + excalibur-naming + 1.0 + + + excalibur-i18n + excalibur-i18n + 1.1 + + + + + commons-collections + commons-collections + 3.1 + + + commons-javaflow + commons-javaflow + r306555 + commons-jxpath commons-jxpath @@ -89,64 +155,16 @@ - excalibur-pool - excalibur-pool-impl - 2.1 - - - commons-collections - commons-collections - 3.1 + commons-cli + commons-cli + 1.0 - commons-javaflow - commons-javaflow + commons-jci + commons-jci r306555 - jcs - jcs - 1.2.5-dev-20050313 - - - xalan - xalan - 2.7.0 - - - avalon-logkit - avalon-logkit - 2.1 - - - knopflerfish - knopflerfish-console_all - 1.0.0 - - - excalibur-sourceresolve - excalibur-sourceresolve - 2.1 - - - commons-vfs - commons-vfs - - - excalibur-fortress-container-api - excalibur-fortress - - - excalibur-fortress-meta - excalibur-fortress - - - qdox - qdox - - - - commons-logging commons-logging 1.0.4 @@ -162,15 +180,26 @@ - easymock - easymock - 1.1 - test + commons-lang + commons-lang + 2.1 - concurrent - concurrent - 1.3.4 + commons-jexl + commons-jexl + 1.0 + + + commons-httpclient + commons-httpclient + 2.0.2 + + + + + knopflerfish + knopflerfish-console_all + 1.0.0 knopflerfish @@ -188,14 +217,9 @@ 1.0.0 - xml-resolver - xml-resolver - 1.1 - - - excalibur-logger - excalibur-logger - 2.1 + knopflerfish + knopflerfish-log_all + 1.0.0 knopflerfish @@ -203,14 +227,27 @@ 1.0.0 - commons-lang - commons-lang - 2.1 + knopflerfish + knopflerfish-http_all + 1.1.0 - commons-jexl - commons-jexl - 1.0 + knopflerfish + knopflerfish-framework + 1.3.3 + + + + + + jcs + jcs + 1.2.5-dev-20050313 + + + xalan + xalan + 2.7.0 xerces @@ -218,19 +255,14 @@ 2.7.1 - avalon-framework - avalon-framework-api - 4.3 - - - knopflerfish - knopflerfish-http_all - 1.1.0 + concurrent + concurrent + 1.3.4 - excalibur-instrument - excalibur-instrument-api - 2.1 + xml-resolver + xml-resolver + 1.1 javax.servlet @@ -239,31 +271,16 @@ provided - knopflerfish - knopflerfish-log_all - 1.0.0 - - rhino js 1.6R1 - knopflerfish - knopflerfish-framework - 1.3.3 - - ant ant-trax 1.6.5 - excalibur-pool - excalibur-pool-instrumented - 2.1 - - ehcache ehcache 1.1 @@ -274,9 +291,14 @@ 1.4 - excalibur-io - excalibur-io - 1.1 + xml-apis + xml-apis + 1.3.02 + + + log4j + log4j + 1.2.12 xmlbeans @@ -284,90 +306,27 @@ 1.0.3 - excalibur-store - excalibur-store - 2.1 - - - avalon-framework - avalon-framework - - - geronimo-spec-javamail - geronimo-spec - - - geronimo-spec-jms - geronimo-spec - - - jisp - jisp - - - logkit - logkit - - - - ant - ant + ant-launcher 1.6.5 - excalibur-xmlutil - excalibur-xmlutil - 2.1 - - - excalibur-testcase - excalibur-component - - - jaxen - jaxen - - - jtidy - jtidy - - - saxon - saxon - - - saxon7 - saxon7 - - - saxon7-jdom - saxon7 - - - saxon7-sql - saxon7 - - - saxpath - saxpath - - - - - excalibur-naming - excalibur-naming - 1.0 + ant + ant-trax + 1.6.5 - commons-httpclient - commons-httpclient - 2.0.2 - + ant + ant + 1.6.5 + + + xmlunit xmlunit 0.8 + test jmock @@ -376,78 +335,16 @@ test - avalon-framework - avalon-framework-impl - 4.3 - - - geronimo-spec-javamail - geronimo-spec - - - servletapi - servletapi - - - geronimo-spec-jms - geronimo-spec - - - jmock - jmock - - - xerces - xerces - - - logkit - logkit - - - avalon-framework - avalon-framework - - - xmlParserAPIs - xml-apis - - - - - xml-apis - xml-apis - 1.3.02 - - - excalibur-pool - excalibur-pool-api - 2.1 - - - commons-cli - commons-cli - 1.0 - - - commons-jci - commons-jci - r306555 - - - log4j - log4j - 1.2.12 - - - ant - ant-launcher - 1.6.5 + junit + junit + 3.8.1 + test - excalibur-i18n - excalibur-i18n + easymock + easymock 1.1 + test Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/api/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/api/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/api/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/api/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,12 +1,19 @@ cocoon-forms - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.forms + 1.0-SNAPSHOT 4.0.0 - apache-cocoon - cocoon-forms-api + org.apache.cocoon.forms + forms-api Forms API - 1.3-SNAPSHOT + 1.0-SNAPSHOT + + + org.apache.cocoon + cocoon-core + 2.2.0-SNAPSHOT + + Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/impl/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/impl/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/impl/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/impl/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,19 +1,32 @@ cocoon-forms - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon.forms + 1.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.forms cocoon-forms-impl Forms Implementation 1.3-SNAPSHOT - apache-cocoon + org.apache.cocoon.ajax cocoon-ajax-impl - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT + + + + org.apache.cocoon + cocoon-core + 2.2.0-SNAPSHOT + tests + + + + org.apache.cocoon.forms + forms-api + 1.0-SNAPSHOT icu4j @@ -31,31 +44,20 @@ 1.1 - apache-cocoon - cocoon-core - 2.2.1-SNAPSHOT - tests - test - - xreporter xreporter-expression 20040701 - apache-cocoon - cocoon-core - 2.2.1-SNAPSHOT - - - apache-cocoon - cocoon-forms-api - 1.3-SNAPSHOT - - jakarta-oro jakarta-oro 2.0.8 + + + xmlunit + xmlunit + 0.8 + test Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,15 +1,15 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.forms cocoon-forms pom Forms Block - 2.2.1-SNAPSHOT + 1.0-SNAPSHOT api impl Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/samples/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/samples/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/samples/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-forms/samples/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,12 +1,12 @@ 4.0.0 - apache-cocoon + org.apache.cocoon.forms cocoon-forms-samples Forms Samples - 2.2.1-SNAPSHOT + 0.6-SNAPSHOT - apache-cocoon + org.apache.cocoon.forms cocoon-forms-impl 1.3-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-mocks/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-mocks/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-mocks/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/cocoon-mocks/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,12 +1,12 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.mocks cocoon-mocks Core Mocks - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,14 +1,20 @@ 4.0.0 - apache-cocoon + org.apache.cocoon cocoon pom Cocoon - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT - scm:svn:http://svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout - scm:svn:https://jheymans@svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout - http://svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout/ + + scm:svn:http://svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout + + + scm:svn:https://jheymans@svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout + + + http://svn.apache.org/repos/asf/cocoon/whiteboard/maven2/cocoon-flat-layout/ + cocoon-core @@ -19,6 +25,11 @@ webapp + + apache-maven-snapshot + Maven Snapshot Repository @ Apache.org + http://cvs.apache.org/maven-snapshot-repository + apache-cvs Apache CVS Repository Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/settings.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/settings.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/settings.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/settings.xml Wed Dec 14 00:58:51 2005 @@ -1,4 +1,4 @@ - c:/temp/maven2-cocoon + mymavenrepo true - \ No newline at end of file + Modified: cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/webapp/pom.xml URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/webapp/pom.xml?rev=356754&r1=356753&r2=356754&view=diff ============================================================================== --- cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/webapp/pom.xml (original) +++ cocoon/whiteboard/maven2/cocoon-flat-layout/trunk/webapp/pom.xml Wed Dec 14 00:58:51 2005 @@ -1,13 +1,13 @@ cocoon - apache-cocoon - 2.2.1-SNAPSHOT + org.apache.cocoon + 2.2.0-SNAPSHOT 4.0.0 - apache-cocoon + org.apache.cocoon.webapp cocoon-webapp war Cocoon Webapp - 2.2.1-SNAPSHOT + 2.2.0-SNAPSHOT