Author: antonio
Date: Fri Jul 8 23:10:18 2005
New Revision: 209928
URL: http://svn.apache.org/viewcvs?rev=209928&view=rev
Log:
Updated cocoon local build files to SVN revision 202297. It works with cocoon
2.1.7. Cocoon Querybean block is no longer included in lenya build.
Modified:
lenya/branches/BRANCH_1_2_X/src/cocoon/local.blocks.properties
lenya/branches/BRANCH_1_2_X/src/cocoon/local.build.properties
Modified: lenya/branches/BRANCH_1_2_X/src/cocoon/local.blocks.properties
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/cocoon/local.blocks.properties?rev=209928&r1=209927&r2=209928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/cocoon/local.blocks.properties (original)
+++ lenya/branches/BRANCH_1_2_X/src/cocoon/local.blocks.properties Fri Jul 8
23:10:18 2005
@@ -36,6 +36,14 @@
# 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
----------------------------------------------------------------
@@ -47,10 +55,9 @@
#-----[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", "scratchpad", "tour".
+#-----[dependency]: "batik" is needed by "fop", "tour".
#include.block.batik=false
include.block.bsf=false
-#-----[dependency]: "chaperon" depends on "xsp" (for samples).
#include.block.chaperon=false
#-----[dependency]: "databases" depends on "xsp".
#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb",
"petstore", "repository", "xmldb".
@@ -61,20 +68,22 @@
#-----[dependency]: "hsqldb" depends on "databases".
#-----[dependency]: "hsqldb" is needed by "jms", "ojb", "petstore".
include.block.hsqldb=false
-#-----[dependency]: "html" is needed by "portal".
#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" depends on "forms" (for samples), "xsp" (for
samples).
+#-----[dependency]: "lucene" is needed by "querybean".
#include.block.lucene=false
#include.block.naming=false
+#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
+#-----[dependency]: "ojb" is needed by "javaflow", "querybean".
+#include.block.ojb=false
include.block.paranoid=false
-include.block.php=false
include.block.poi=false
-#-----[dependency]: "portal" depends on "authentication-fw", "html",
"session-fw".
+#-----[dependency]: "portal" depends on "authentication-fw", "cron", "forms",
"session-fw".
#-----[dependency]: "portal" is needed by "faces".
include.block.portal=false
#include.block.profiler=false
@@ -89,9 +98,23 @@
#-----[dependency]: "xmldb" depends on "databases".
# TODO: Including the xmldb block might cause a conflict with the patched
xmldb libraries lib/xmldb-common-2003-09-02.jar and
lib/xmldb-xupdate-2003-10-14.jar
include.block.xmldb=false
-#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache",
"forms", "linkrewriter", "lucene", "python", "scratchpad", "session-fw",
"woody".
+#-----[dependency]: "xsp" is needed by "databases", "itext", "linkrewriter",
"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
@@ -106,62 +129,45 @@
include.block.apples=false
#-----[dependency]: "asciiart" is needed by "mail".
include.block.asciiart=false
-#-----[dependency]: "axis" is needed by "scratchpad".
include.block.axis=false
-#-----[dependency]: "cron" is needed by "scratchpad".
+#-----[dependency]: "cron" is needed by "jms", "portal".
include.block.cron=true
#include.block.deli=false
-#-----[dependency]: "eventcache" depends on "jms", "xsp" (for samples).
-#-----[dependency]: "eventcache" is needed by "repository", "scratchpad".
+#-----[dependency]: "eventcache" depends on "jms".
+#-----[dependency]: "eventcache" is needed by "repository".
include.block.eventcache=false
#-----[dependency]: "faces" depends on "portal", "taglib".
include.block.faces=false
-#-----[dependency]: "forms" depends on "xsp" (for samples).
-#-----[dependency]: "forms" is needed by "apples", "javaflow", "lucene",
"ojb", "petstore", "tour".
+#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb",
"petstore", "portal", "querybean", "tour".
#include.block.forms=false
#-----[dependency]: "javaflow" depends on "forms", "ojb".
include.block.javaflow=false
-#-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb".
+#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".
include.block.mail=false
include.block.midi=false
-#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
-#-----[dependency]: "ojb" is needed by "javaflow".
-include.block.ojb=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 "scratchpad", "slide", "webdav".
+#-----[dependency]: "repository" is needed by "slide", "webdav".
include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "axis", "batik" (for samples),
"cron", "eventcache", "repository", "xsp".
-include.block.scratchpad=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]: "tour" depends on "batik", "fop", "forms".
+#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
include.block.tour=false
#-----[dependency]: "webdav" depends on "repository".
include.block.webdav=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
Modified: lenya/branches/BRANCH_1_2_X/src/cocoon/local.build.properties
URL:
http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/cocoon/local.build.properties?rev=209928&r1=209927&r2=209928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/cocoon/local.build.properties (original)
+++ lenya/branches/BRANCH_1_2_X/src/cocoon/local.build.properties Fri Jul 8
23:10:18 2005
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 The Apache Software Foundation
+# Copyright 1999-2005 The Apache Software Foundation
#
-# 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
+# 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
+# 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.
+# 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
@@ -33,7 +33,10 @@
exclude.deprecated=true
exclude.documentation=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
-----------------------------------------------------------
@@ -65,10 +68,27 @@
# disable some long-running tests by default
# anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
+# ---- htmlUnit
----------------------------------------------------------------
+
+htmlunit.home = /default-from-build.properties/htmlunit-1.5
+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 <fileset>/<include> elements
+htmlunit.test.include=**/*TestCase.class
+
# ---- JUnit
-------------------------------------------------------------------
junit.test.debugport=8000
#junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase
+junit.test.loglevel=0
+
+# ---- IDE
---------------------------------------------------------------------
+
+ide.eclipse.outputdir=${build.root}/eclipse/classes
+ide.eclipse.export.libs=false
# ---- Build
-------------------------------------------------------------------
@@ -78,6 +98,10 @@
build.mocks=${build}/mocks
build.test=${build}/test
build.test.output=${build.test}/output
+build.test.report=${build.test}/report
+build.test.htmlunit=${build.test}/htmlunit
+build.test.htmlunit.output=${build.test.htmlunit}/output
+build.test.htmlunit.report=${build.test.htmlunit}/report
build.docs=${build}/docs
build.docs.printer=${build}/printer-docs
build.site=${build}/site
@@ -94,7 +118,7 @@
build.docs.loglevel=ERROR
build.docs.printer.loglevel=ERROR
-# ------ Webapp Build Properties
-----------------------------------------------
+# ---- Webapp Build Properties
-------------------------------------------------
build.webapp=${build.root}/webapp
build.webapp.webinf=${build.webapp}/WEB-INF
@@ -107,7 +131,8 @@
build.webapp.loglevel=INFO
build.war=${build}/${name}.war
-# ------ Standalone-demo Build Properties
--------------------------------------
+# ---- Standalone-demo Build Properties
----------------------------------------
+
build.standalone.demo=${build.root}/standalone-demo
# ---- Compilation
-------------------------------------------------------------
@@ -119,8 +144,7 @@
compiler.nowarn=on
source.vm=1.4
-
-# ------ System Properties
-----------------------------------------------------
+# ---- System Properties
-------------------------------------------------------
# WARNING: you shouldn't need to modify anything below here since there is a
# very high change of breaking the build system. Do it only if you know what
@@ -164,10 +188,6 @@
tools.loader.src=${tools.src}/loader
tools.loader.dest=${tools}/loader
tools.jetty=${tools}/jetty
-
-# IDE
-ide.eclipse.outputdir=${build.root}/eclipse/classes
-ide.eclipse.export.libs=false
# Libraries
lib=lib
|
