Author: crossley
Date: Thu Aug 21 03:07:36 2008
New Revision: 687681
URL: http://svn.apache.org/viewvc?rev=687681&view=rev
Log:
Keep synchronised with blocks.properties and build.properties in current
Cocoon-2.1 which
enables us to easily compare and so see what we have changed.
Modified:
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.blocks.properties
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.build.properties
Modified:
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.blocks.properties
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.blocks.properties?rev=687681&r1=687680&r2=687681&view=diff
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.blocks.properties
(original)
+++
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.blocks.properties
Thu Aug 21 03:07:36 2008
@@ -69,59 +69,72 @@
# can depend on.
#-----[dependency]: "authentication-fw" depends on "session-fw".
-#-----[dependency]: "authentication-fw" is needed by "portal", "portal-sample".
+#-----[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=true
#include.block.bsf=false
-#-----[dependency]: "chaperon" depends on "template" (for samples).
include.block.chaperon=true
-#include.block.core-samples-additional=false
-#-----[dependency]: "core-samples-main" depends on "xsp" (for samples).
-#include.block.core-samples-main=false
-#-----[dependency]: "databases" depends on "hsqldb" (for samples).
-#-----[dependency]: "databases" is needed by "jms", "ojb", "petstore",
"repository", "xmldb", "xsp".
+#-----[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".
+#-----[dependency]: "fop" depends on "batik", "xsp" (for samples).
#-----[dependency]: "fop" is needed by "tour".
include.block.fop=true
-#-----[dependency]: "hsqldb" is needed by "databases", "jms", "ojb",
"petstore".
+#-----[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=true
#-----[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=true
-#-----[dependency]: "lucene" depends on "template" (for samples).
#-----[dependency]: "lucene" is needed by "querybean".
include.block.lucene=true
#include.block.midi=false
#include.block.naming=false
-#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for
samples), "hsqldb" (for samples).
-#-----[dependency]: "ojb" is needed by "portal-sample", "querybean".
+#-----[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 "ajax", "authentication-fw", "cron",
"forms", "session-fw".
-#-----[dependency]: "portal" is needed by "faces", "portal-sample".
+#-----[dependency]: "portal" depends on "auth", "authentication-fw", "cron",
"forms", "ojb", "session-fw".
+#-----[dependency]: "portal" is needed by "faces".
#include.block.portal=false
-#-----[dependency]: "portal-sample" depends on "authentication-fw", "cron",
"forms", "ojb", "portal", "session-fw", "template" (for samples).
-#include.block.portal-sample=false
+#-----[dependency]: "profiler" depends on "auth".
include.block.profiler=true
#-----[dependency]: "python" depends on "xsp".
#include.block.python=false
-#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal",
"portal-sample", "xsp".
+#-----[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", "scratchpad".
+#-----[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" depends on "databases", "session-fw".
-#-----[dependency]: "xsp" is needed by "core-samples-main", "itext", "mail",
"python", "scratchpad".
+#-----[dependency]: "xsp" is needed by "axis", "databases", "fop", "itext",
"linkrewriter", "ojb", "python", "session-fw", "woody".
include.block.xsp=true
+# 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
@@ -132,61 +145,59 @@
# its development as things might change over time before they are marked
# stable.
-#-----[dependency]: "ajax" is needed by "forms", "portal".
+#-----[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=true
-#-----[dependency]: "axis" is needed by "scratchpad".
+#-----[dependency]: "auth" is needed by "portal", "profiler".
+include.block.auth=true
+#-----[dependency]: "axis" depends on "xsp" (for samples).
#include.block.axis=false
+#-----[dependency]: "captcha" depends on "template" (for samples).
#include.block.captcha=false
-#-----[dependency]: "cron" depends on "template" (for samples).
-#-----[dependency]: "cron" is needed by "jms", "portal", "portal-sample",
"scratchpad".
+#-----[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".
+#-----[dependency]: "eventcache" is needed by "repository", "webdav".
#include.block.eventcache=false
#-----[dependency]: "faces" depends on "portal", "taglib".
-#-----[dependency]: "faces" is needed by "scratchpad".
#include.block.faces=false
-#-----[dependency]: "forms" depends on "ajax", "template".
-#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb",
"petstore", "portal", "portal-sample", "querybean", "tour".
-#include.block.forms=false
-#-----[dependency]: "javaflow" depends on "forms", "template" (for samples).
-#-----[dependency]: "javaflow" is needed by "scratchpad".
+#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" (for samples).
+include.block.jcr=false
+#-----[dependency]: "jms" depends on "cron", "databases" (for samples),
"hsqldb".
#-----[dependency]: "jms" is needed by "eventcache", "slide".
#include.block.jms=false
-#-----[dependency]: "mail" depends on "asciiart" (for samples), "xsp" (for
samples).
+#include.block.linotype=false
+#-----[dependency]: "mail" depends on "asciiart" (for samples).
#include.block.mail=false
-#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb",
"template", "velocity".
+#-----[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", "template" (for samples).
+#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene",
"ojb".
#include.block.querybean=false
-#-----[dependency]: "repository" depends on "databases" (for samples),
"eventcache".
-#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
+#-----[dependency]: "repository" depends on "databases", "eventcache".
+#-----[dependency]: "repository" is needed by "slide", "webdav".
#include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for
samples), "cron", "faces" (for samples), "javaflow", "repository", "template"
(for samples), "velocity" (for samples), "xsp".
-#include.block.scratchpad=false
#include.block.serializers=false
-#-----[dependency]: "slide" depends on "jms", "repository", "template" (for
samples).
+#-----[dependency]: "slide" depends on "jms", "repository".
#include.block.slide=false
#-----[dependency]: "slop" is needed by "tour".
#include.block.slop=false
-#include.block.spring-app=false
#include.block.stx=false
#-----[dependency]: "taglib" is needed by "faces".
#include.block.taglib=false
-#-----[dependency]: "template" is needed by "chaperon", "cron", "eventcache",
"forms", "javaflow", "lucene", "petstore", "portal-sample", "querybean",
"scratchpad", "slide", "tour", "webdav".
+#-----[dependency]: "template" is needed by "ajax", "captcha", "eventcache",
"forms".
include.block.template=true
-#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop",
"template".
+#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
#include.block.tour=false
include.block.validation=true
-#-----[dependency]: "webdav" depends on "repository", "template" (for samples).
+#-----[dependency]: "webdav" depends on "eventcache", "repository".
#include.block.webdav=false
+#include.block.xsltal=false
Modified:
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.build.properties
URL:
http://svn.apache.org/viewvc/forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.build.properties?rev=687681&r1=687680&r2=687681&view=diff
==============================================================================
---
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.build.properties
(original)
+++
forrest/branches/update_cocoon_2.1.12-dev/etc/cocoon_upgrade/local.build.properties
Thu Aug 21 03:07:36 2008
@@ -43,6 +43,7 @@
#include.driver.odbc=true
#config.allow-reloads=true
#config.enable-uploads=true
+#config.enable-instrumentation=true
# ---- Validation
--------------------------------------------------------------
@@ -60,23 +61,27 @@
# 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 <fileset>/<include> elements
+htmlunit.test.include=**/*TestCase.class
+
# ---- JUnit
-------------------------------------------------------------------
junit.test.debugport=8000
#junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase
-junit.test.loglevel=1
-
-# Optionally enable remote debugging when running the JUnit tests.
-# Uncomment one of the following lines only, the property must be present even
if empty.
-# Note that setting suspend=y might cause the JVM to stop several times when
running the
-# tests, as the build forks a new JVM at several points.
-# This is most useful together with the junit.test.include.* properties below
-#junit.test.jvmargs=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-junit.test.jvmargs=
-
-# Define which JUnit tests to run - useful to run a subset of tests
-junit.test.include.1=**/*TestCase.class
-junit.test.include.2=**/*Test.class
+junit.test.loglevel=0
# ---- IDE
---------------------------------------------------------------------
@@ -92,6 +97,9 @@
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.javadocs=${build}/javadocs
build.context=${build}/documentation
build.blocks=${build}/blocks
@@ -110,6 +118,8 @@
build.webapp.test-suite=${build.webapp}/test-suite
build.webapp.loglevel=INFO
build.webapp.logappend=false
+# Change the sample's hsqldb server port to run multiple Cocoons on a single
machine
+#build.webapp.hsqldb-server-port=9003
build.war=${build}/${name}.war
# ---- Standalone-demo Build Properties
----------------------------------------
