Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 52408 invoked from network); 6 Oct 2008 06:13:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Oct 2008 06:13:55 -0000 Received: (qmail 52245 invoked by uid 500); 6 Oct 2008 06:13:53 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 52187 invoked by uid 500); 6 Oct 2008 06:13:53 -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 52178 invoked by uid 99); 6 Oct 2008 06:13:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Oct 2008 23:13:53 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Oct 2008 06:12:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0B88423888E6; Sun, 5 Oct 2008 23:13:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701954 - in /cocoon/cocoon3/trunk: ./ cocoon-all/ cocoon-all/src/main/assembly/ cocoon-all/src/main/groovy/ cocoon-optional/ cocoon-optional/src/ cocoon-optional/src/main/ cocoon-optional/src/main/java/ cocoon-optional/src/main/java/org/ c... Date: Mon, 06 Oct 2008 06:13:00 -0000 To: cvs@cocoon.apache.org From: reinhard@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081006061301.0B88423888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reinhard Date: Sun Oct 5 23:12:59 2008 New Revision: 701954 URL: http://svn.apache.org/viewvc?rev=701954&view=rev Log: introduce an optional module for stuff that would otherwise introduce additional dependencies to core modules (pipeline, sitemap, servlet) Added: cocoon/cocoon3/trunk/cocoon-optional/ (with props) cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt (with props) cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt (with props) cocoon/cocoon3/trunk/cocoon-optional/pom.xml (with props) cocoon/cocoon3/trunk/cocoon-optional/src/ cocoon/cocoon3/trunk/cocoon-optional/src/main/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/ cocoon/cocoon3/trunk/cocoon-optional/src/main/resources/ cocoon/cocoon3/trunk/cocoon-optional/src/test/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/sax/ cocoon/cocoon3/trunk/cocoon-optional/src/test/resources/ Modified: cocoon/cocoon3/trunk/cocoon-all/pom.xml cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy cocoon/cocoon3/trunk/cocoon-sample/pom.xml cocoon/cocoon3/trunk/parent/pom.xml cocoon/cocoon3/trunk/release.pom.xml Modified: cocoon/cocoon3/trunk/cocoon-all/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/pom.xml?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/pom.xml (original) +++ cocoon/cocoon3/trunk/cocoon-all/pom.xml Sun Oct 5 23:12:59 2008 @@ -26,13 +26,13 @@ org.apache.cocoon.parent cocoon-parent - 3.0.0-alpha-1 + 3.0.0-alpha-2-SNAPSHOT ../parent org.apache.cocoon.all cocoon-all 3.0.0-alpha-2-SNAPSHOT - Cocoon 3: All dependencies + Cocoon 3: All dependencies [jar] This module can be used to get all Cocoon 3 dependencies in one go. @@ -41,6 +41,10 @@ cocoon-controller + org.apache.cocoon.optional + cocoon-optional + + org.apache.cocoon.pipeline cocoon-pipeline Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml (original) +++ cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml Sun Oct 5 23:12:59 2008 @@ -48,7 +48,15 @@ pom.xml src/ - + + + ../cocoon-optional + src/cocoon-optional + + pom.xml + src/ + + ../cocoon-pipeline src/cocoon-pipeline Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy (original) +++ cocoon/cocoon3/trunk/cocoon-all/src/main/groovy/docs.groovy Sun Oct 5 23:12:59 2008 @@ -25,7 +25,10 @@ ant.copy(todir: new File(project.basedir, "./target/sources")) { fileset(dir: new File(project.basedir, "../cocoon-controller/src/main/java")) { exclude(name: '**/.svn') - } + } + fileset(dir: new File(project.basedir, "../cocoon-optional/src/main/java")) { + exclude(name: '**/.svn') + } fileset(dir: new File(project.basedir, "../cocoon-pipeline/src/main/java")) { exclude(name: '**/.svn') } Propchange: cocoon/cocoon3/trunk/cocoon-optional/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Oct 5 23:12:59 2008 @@ -0,0 +1,4 @@ +.settings +target +.classpath +.project Added: cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt?rev=701954&view=auto ============================================================================== --- cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt (added) +++ cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt Sun Oct 5 23:12:59 2008 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Propchange: cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-optional/LICENSE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt?rev=701954&view=auto ============================================================================== --- cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt (added) +++ cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt Sun Oct 5 23:12:59 2008 @@ -0,0 +1,5 @@ +Apache Cocoon +Copyright 1999-2008 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). Propchange: cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-optional/NOTICE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: cocoon/cocoon3/trunk/cocoon-optional/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/pom.xml?rev=701954&view=auto ============================================================================== --- cocoon/cocoon3/trunk/cocoon-optional/pom.xml (added) +++ cocoon/cocoon3/trunk/cocoon-optional/pom.xml Sun Oct 5 23:12:59 2008 @@ -0,0 +1,59 @@ + + + + + + 4.0.0 + jar + + + org.apache.cocoon.parent + cocoon-parent + 3.0.0-alpha-2-SNAPSHOT + ../parent + + org.apache.cocoon.optional + cocoon-optional + 3.0.0-alpha-2-SNAPSHOT + Cocoon 3: Optional [jar] + + This is an optional module for Cocoon 3. It contains all the stuff that requires additional + 3rd-party libraries that shouldn't become part of one of the Cocoon 3 core modules + (cocoon-pipeline, cocoon-sitemap, cocoon-servlet). + + + + + org.apache.cocoon.pipeline + cocoon-pipeline + + + + junit + junit + test + + + xmlunit + xmlunit + test + + + Propchange: cocoon/cocoon3/trunk/cocoon-optional/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cocoon/cocoon3/trunk/cocoon-optional/pom.xml ------------------------------------------------------------------------------ svn:keywords = Id Propchange: cocoon/cocoon3/trunk/cocoon-optional/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: cocoon/cocoon3/trunk/cocoon-sample/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/pom.xml?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/cocoon-sample/pom.xml (original) +++ cocoon/cocoon3/trunk/cocoon-sample/pom.xml Sun Oct 5 23:12:59 2008 @@ -46,6 +46,10 @@ cocoon-stringtemplate + org.apache.cocoon.optional + cocoon-optional + + javax.servlet servlet-api provided Modified: cocoon/cocoon3/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/parent/pom.xml (original) +++ cocoon/cocoon3/trunk/parent/pom.xml Sun Oct 5 23:12:59 2008 @@ -38,6 +38,7 @@ ../cocoon-all ../cocoon-controller + ../cocoon-optional ../cocoon-pipeline ../cocoon-rest ../cocoon-sample @@ -152,6 +153,18 @@ aspectjweaver 1.5.4 + + + + org.hibernate + hibernate + 3.2.6.ga + + + org.hibernate + hibernate-annotations + 3.4.0.GA + @@ -202,6 +215,11 @@ 3.0.0-alpha-2-SNAPSHOT + org.apache.cocoon.optional + cocoon-optional + 3.0.0-alpha-2-SNAPSHOT + + org.apache.cocoon.pipeline cocoon-pipeline 3.0.0-alpha-2-SNAPSHOT Modified: cocoon/cocoon3/trunk/release.pom.xml URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/release.pom.xml?rev=701954&r1=701953&r2=701954&view=diff ============================================================================== --- cocoon/cocoon3/trunk/release.pom.xml (original) +++ cocoon/cocoon3/trunk/release.pom.xml Sun Oct 5 23:12:59 2008 @@ -35,7 +35,8 @@ cocoon-archetype-parent cocoon-archetype-sample cocoon-archetype-webapp - cocoon-controller + cocoon-controller + cocoon-optional cocoon-pipeline cocoon-rest cocoon-sample