Return-Path: X-Original-To: apmail-cocoon-cvs-archive@www.apache.org Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 334E39844 for ; Tue, 20 Mar 2012 13:02:24 +0000 (UTC) Received: (qmail 75255 invoked by uid 500); 20 Mar 2012 13:02:24 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 75188 invoked by uid 500); 20 Mar 2012 13:02:23 -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 75171 invoked by uid 99); 20 Mar 2012 13:02:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Mar 2012 13:02:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Tue, 20 Mar 2012 13:02:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 226F72388860 for ; Tue, 20 Mar 2012 13:02:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1302866 - in /cocoon/trunk/jail: ./ cocoon2.1/ cocoon2.1/lib/ cocoon2.1/src/ cocoon2.1/src/cocoon/ cocoon2.1/src/cocoon/webapp/ cocoon2.1/src/cocoon/xconf/ cocoon2.1/src/java/ Date: Tue, 20 Mar 2012 13:02:00 -0000 To: cvs@cocoon.apache.org From: ilgrosso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120320130201.226F72388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ilgrosso Date: Tue Mar 20 13:02:00 2012 New Revision: 1302866 URL: http://svn.apache.org/viewvc?rev=1302866&view=rev Log: Added 2.1 samples with ant-based build Added: cocoon/trunk/jail/cocoon2.1/ cocoon/trunk/jail/cocoon2.1/.cvsignore cocoon/trunk/jail/cocoon2.1/build-cocoon-targets.xml (with props) cocoon/trunk/jail/cocoon2.1/build.xml (with props) cocoon/trunk/jail/cocoon2.1/lib/ cocoon/trunk/jail/cocoon2.1/src/ cocoon/trunk/jail/cocoon2.1/src/cocoon/ cocoon/trunk/jail/cocoon2.1/src/cocoon/local.build.properties cocoon/trunk/jail/cocoon2.1/src/cocoon/webapp/ cocoon/trunk/jail/cocoon2.1/src/cocoon/xconf/ cocoon/trunk/jail/cocoon2.1/src/java/ cocoon/trunk/jail/cocoon2.1/user.properties Modified: cocoon/trunk/jail/index.html Added: cocoon/trunk/jail/cocoon2.1/.cvsignore URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon2.1/.cvsignore?rev=1302866&view=auto ============================================================================== --- cocoon/trunk/jail/cocoon2.1/.cvsignore (added) +++ cocoon/trunk/jail/cocoon2.1/.cvsignore Tue Mar 20 13:02:00 2012 @@ -0,0 +1,3 @@ +build +tools +user.properties \ No newline at end of file Added: cocoon/trunk/jail/cocoon2.1/build-cocoon-targets.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon2.1/build-cocoon-targets.xml?rev=1302866&view=auto ============================================================================== Binary file - no diff available. Propchange: cocoon/trunk/jail/cocoon2.1/build-cocoon-targets.xml ------------------------------------------------------------------------------ svn:mime-type = application/xml Added: cocoon/trunk/jail/cocoon2.1/build.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon2.1/build.xml?rev=1302866&view=auto ============================================================================== Binary file - no diff available. Propchange: cocoon/trunk/jail/cocoon2.1/build.xml ------------------------------------------------------------------------------ svn:mime-type = application/xml Added: cocoon/trunk/jail/cocoon2.1/src/cocoon/local.build.properties URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon2.1/src/cocoon/local.build.properties?rev=1302866&view=auto ============================================================================== --- cocoon/trunk/jail/cocoon2.1/src/cocoon/local.build.properties (added) +++ cocoon/trunk/jail/cocoon2.1/src/cocoon/local.build.properties Tue Mar 20 13:02:00 2012 @@ -0,0 +1,302 @@ + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# + +#------------------------------------------------------------------------------# +# ***** DO NOT edit blocks.properties yourself! ******** # +# This file is generated from gump.xml - to keep it in sync when that file is # +# modified, use the generate-blocks.properties build target. # +#------------------------------------------------------------------------------# + +#------------------------------------------------------------------------------# +# Cocoon Blocks # +#------------------------------------------------------------------------------# + +# Remove blocks from your cocoon distribution by setting the corresponding +# include property to true or false. The blocks are included by default, i.e. if +# no property was set. + +# NOTE: Don't modify this file directly but make a copy named +# 'local.blocks.properties' and modify that. The build system will first load +# 'local.blocks.properties' and properties are immutable in Ant. + +# For most cases it is enough that you exclude all blocks and include only those +# few you want, example: +# exclude.all.blocks=true +# include.block.forms=true +# include.block.template=true + +# The opposite is also allowed: +# include.all.blocks=true +# exclude.block.scratchpad=true + +# If there is a conflict on the same level of granularity: +# include.block.template=true vs. exclude.block.template=true, +# include.all.blocks=true vs. exclude.all.blocks=true +# it is always resolved in favour of include.* properties. + +# NOTE: "[dependency]" indicates blocks that are required by other blocks. +# Disabling batik, for example, will result in a RuntimeException when using +# fop. Dependencies only needed for the block's samples are marked explicitely. +# This latter information was introduced only short time ago, so do not expect +# it to be complete. + +# NOTE: (to Cocoon committers): blocks.properties is generated from gump.xml +# using "build generate-blocks.properties". Any changes to blocks definitions +# must be made in gump.xml, not here. + +# All blocks ------------------------------------------------------------------- + +# Use this property to exclude all blocks at once +# exclude.all.blocks=true + +# Use this property to include all blocks at once +include.all.blocks=true + + +# Stable blocks ---------------------------------------------------------------- + +# Stable blocks are those that can be considered ready for production and +# will contain components and API that will remain stable and where +# developers are committed to back compatibility. In short, stuff that you +# can depend on. + +#-----[dependency]: "authentication-fw" depends on "session-fw". +#-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw". +#include.block.authentication-fw=false +#-----[dependency]: "batik" is needed by "fop", "tour". +#include.block.batik=false +#include.block.bsf=false +#include.block.chaperon=false +#-----[dependency]: "databases" depends on "xsp". +#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", "petstore", "repository", "xmldb". +#include.block.databases=false +#-----[dependency]: "fop" depends on "batik", "xsp" (for samples). +#-----[dependency]: "fop" is needed by "tour". +#include.block.fop=false +#-----[dependency]: "forms" depends on "ajax", "template" (for samples). +#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore", "portal", "querybean", "tour". +#include.block.forms=false +#-----[dependency]: "hsqldb" depends on "databases". +#-----[dependency]: "hsqldb" is needed by "jms", "ojb", "petstore". +#include.block.hsqldb=false +#include.block.html=false +#-----[dependency]: "itext" depends on "xsp" (for samples). +#include.block.itext=false +#include.block.jfor=false +#include.block.jsp=false +#-----[dependency]: "linkrewriter" depends on "xsp". +#include.block.linkrewriter=false +#-----[dependency]: "lucene" is needed by "querybean". +#include.block.lucene=false +#include.block.midi=false +#include.block.naming=false +#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb" (for samples), "xsp" (for samples). +#-----[dependency]: "ojb" is needed by "javaflow", "portal", "querybean". +#include.block.ojb=false +#include.block.paranoid=false +#include.block.poi=false +#-----[dependency]: "portal" depends on "auth", "authentication-fw", "cron", "forms", "ojb", "session-fw". +#-----[dependency]: "portal" is needed by "faces". +#include.block.portal=false +#-----[dependency]: "profiler" depends on "auth". +#include.block.profiler=false +#-----[dependency]: "python" depends on "xsp". +#include.block.python=false +#-----[dependency]: "session-fw" depends on "xsp". +#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-fw". +#include.block.session-fw=false +#-----[dependency]: "velocity" is needed by "petstore". +#include.block.velocity=false +#include.block.web3=false +#-----[dependency]: "xmldb" depends on "databases". +#include.block.xmldb=false +#-----[dependency]: "xsp" is needed by "axis", "databases", "fop", "itext", "linkrewriter", "ojb", "python", "session-fw", "woody". +#include.block.xsp=false + +# Deprecated blocks ------------------------------------------------------------ + +# Although some of these blocks may have been stable, they are now deprecated +# in favour of other blocks and therefore are excluded by default from the build. +# For including one of them you have to set the exclude property into comment in +# blocks.properties. + +include.block.php=false +#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw". +include.block.portal-fw=false +include.block.swf=false +#-----[dependency]: "woody" depends on "xsp" (for samples). +include.block.woody=false + +# Unstable blocks -------------------------------------------------------------- + +# Unstable blocks are currently under development and do not guarantee that the +# contracts they expose (API, xml schema, properties, behavior) will remain +# constant in time. Developers are not committed to back-compatibility just yet. +# This doesn't necessarily mean the blocks implementation is unstable or +# the code can't be trusted for production, but use with care and watch +# its development as things might change over time before they are marked +# stable. + +#-----[dependency]: "ajax" depends on "template" (for samples). +#-----[dependency]: "ajax" is needed by "forms". +#include.block.ajax=false +#-----[dependency]: "apples" depends on "forms" (for samples). +#include.block.apples=false +#-----[dependency]: "asciiart" is needed by "mail". +#include.block.asciiart=false +#-----[dependency]: "auth" is needed by "portal", "profiler". +#include.block.auth=false +#-----[dependency]: "axis" depends on "xsp" (for samples). +#include.block.axis=false +#-----[dependency]: "captcha" depends on "template" (for samples). +#include.block.captcha=false +#-----[dependency]: "cron" is needed by "jms", "portal". +#include.block.cron=false +#include.block.deli=false +#-----[dependency]: "eventcache" depends on "jms", "template" (for samples). +#-----[dependency]: "eventcache" is needed by "repository", "webdav". +#include.block.eventcache=false +#-----[dependency]: "faces" depends on "portal", "taglib". +#include.block.faces=false +#include.block.imageop=false +#-----[dependency]: "javaflow" depends on "forms", "ojb". +#include.block.javaflow=false +include.block.jcr=false +#-----[dependency]: "jms" depends on "cron", "databases" (for samples), "hsqldb". +#-----[dependency]: "jms" is needed by "eventcache", "slide". +#include.block.jms=false +#include.block.linotype=false +#-----[dependency]: "mail" depends on "asciiart" (for samples). +#include.block.mail=false +#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity". +#include.block.petstore=false +#include.block.proxy=false +#include.block.qdox=false +#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene", "ojb". +#include.block.querybean=false +#-----[dependency]: "repository" depends on "databases", "eventcache". +#-----[dependency]: "repository" is needed by "slide", "webdav". +#include.block.repository=false +#include.block.serializers=false +#-----[dependency]: "slide" depends on "jms", "repository". +#include.block.slide=false +#-----[dependency]: "slop" is needed by "tour". +#include.block.slop=false +#include.block.stx=false +#-----[dependency]: "taglib" is needed by "faces". +#include.block.taglib=false +#-----[dependency]: "template" is needed by "ajax", "captcha", "eventcache", "forms". +#include.block.template=false +#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop". +#include.block.tour=false +#include.block.validation=false +#-----[dependency]: "webdav" depends on "eventcache", "repository". +#include.block.webdav=false +#include.block.xsltal=false +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# +#---------------------------------------------- +# Cocoon Build Properties +#---------------------------------------------- + +# NOTE: don't modify this file directly but copy the properties you need +# to modify over to a file named 'local.build.properties' and modify that. +# The build system will override these properties with the ones in the +# 'local.build.properties' file. + +# ---- Webapp ------------------------------------------------------------------ + +#exclude.webapp.samples=true +exclude.webapp.test-suite=true + +# ---- Build Exclusions -------------------------------------------------------- + +#exclude.deprecated=true +#exclude.javadocs=true +# Include Java source code into the binary jar files +#include.sources-in-jars=true +# Include Java source code into separate, source only jar files +#include.sources-jars=true + +# ---- Configuration ----------------------------------------------------------- + +#include.driver.oracle=true +#include.driver.postgre=true +#include.driver.odbc=true +#config.allow-reloads=true +config.enable-uploads=true +#config.enable-instrumentation=true + +# ---- Validation -------------------------------------------------------------- + +#exclude.validate.config=true +#exclude.validate.jars=true + +# ---- Anteater ---------------------------------------------------------------- + +anteater.home = /default-from-build.properties/anteater-0.9.16 +anteater.target.host = localhost +anteater.target.port = 8888 +anteater.target.base.path = / +anteater.option.haltonerror = true + +# disable some long-running tests by default +# anteater.test.bug26186InternalRequestMemoryLeak.enabled = true + +# ---- htmlUnit ---------------------------------------------------------------- + +# htmlunit can be downloaded from http://htmlunit.sourceforge.net/ +# Tests currently require htmlunit 1.13, please change this +# comment and the default value below if moving to another version + +htmlunit.home = /default-from-build.properties/htmlunit-1.13 +htmlunit.test.baseurl=http://localhost:8888/ + +# for serious leak testing increase iteration count to 10000 +htmlunit.test.Bug26186InternalRequestMemoryLeak.iterations=1 + +# This can be changed to run only a subset of the tests +# The mask is used in ant / elements +htmlunit.test.include=**/*TestCase.class + +# ---- JUnit ------------------------------------------------------------------- + +junit.test.debugport=8000 +#junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase +junit.test.loglevel=0 + +# ---- Compilation ------------------------------------------------------------- + +compiler=modern +compiler.debug=off +compiler.optimize=on +compiler.deprecation=off +compiler.nowarn=on +source.vm=1.6 Added: cocoon/trunk/jail/cocoon2.1/user.properties URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/cocoon2.1/user.properties?rev=1302866&view=auto ============================================================================== --- cocoon/trunk/jail/cocoon2.1/user.properties (added) +++ cocoon/trunk/jail/cocoon2.1/user.properties Tue Mar 20 13:02:00 2012 @@ -0,0 +1,5 @@ +# +# File automatically generated by ant script for cocoon-2.1-samples. +# Manually extend it to your own needs. +# +cocoon.distro.home=../../cocoon-2_1_X Modified: cocoon/trunk/jail/index.html URL: http://svn.apache.org/viewvc/cocoon/trunk/jail/index.html?rev=1302866&r1=1302865&r2=1302866&view=diff ============================================================================== --- cocoon/trunk/jail/index.html (original) +++ cocoon/trunk/jail/index.html Tue Mar 20 13:02:00 2012 @@ -70,6 +70,7 @@

Apache Cocoon