forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r111200 - in forrest/trunk: etc/cocoon_upgrade lib/core main/java/org/apache/cocoon/components/modules/input/lm main/java/org/apache/cocoon/selection main/java/org/apache/cocoon/transformation
Date Wed, 08 Dec 2004 03:08:29 GMT
Author: rick
Date: Tue Dec  7 19:08:27 2004
New Revision: 111200

URL: http://svn.apache.org/viewcvs?view=rev&rev=111200
Log:
Upgrade the version of Cocoon that Forrest uses to a new revision, 
cocoon 2.2.0-dev revision 111170 (cocoon trunk).

Major Changes:

  * Developement jars from cocooon are suffixed with 2.2.0-dev-rNNNNN
    where NNNN is the subversion revision from whence it came.
  * EHCache (ehcache.sourceforge.net) is now being used instead of JCS
  * by Cocoon and hence, now by Forrest as well.
  * Cocoon now uses the avalon.framework.service.* interface instead of
    the avalon.framework.component.* interfaces.  The Forrest Java
    classes have been updated to reflect that move.

Known Issues:

  * A "forrest site" generates tons of "DEBUG" information from EHCache.
    That should be correctible via some configuration change, but has
    not been done here.
  * The LocationMap.java class has not been updated to use the
    avalon.framework.service.* interface.


Added:
   forrest/trunk/etc/cocoon_upgrade/blocks.properties   (contents, props changed)
   forrest/trunk/etc/cocoon_upgrade/build.properties   (contents, props changed)
   forrest/trunk/lib/core/cocoon-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-deprecated-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev-r111170.jar   (contents, props changed)
   forrest/trunk/lib/core/ehcache-1.0.jar   (contents, props changed)
   forrest/trunk/lib/core/ehcache-1.0.jar.license.txt   (contents, props changed)
Removed:
   forrest/trunk/lib/core/cocoon-20041018-r54993.jar
   forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-deprecated-20041018-r54993.jar
   forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar
   forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar
   forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar
   forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar.license.txt
   forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar
   forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar.license.txt
   forrest/trunk/lib/core/jcs-1.1-dev-20040811.jar
   forrest/trunk/lib/core/jcs-1.1-dev.20040811.jar.license.txt
Modified:
   forrest/trunk/etc/cocoon_upgrade/README.txt
   forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
   forrest/trunk/etc/cocoon_upgrade/local.build.properties
   forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
   forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java
   forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java
   forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java
   forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java
   forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java
   forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java

Modified: forrest/trunk/etc/cocoon_upgrade/README.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/README.txt?view=diff&rev=111200&p1=forrest/trunk/etc/cocoon_upgrade/README.txt&r1=111199&p2=forrest/trunk/etc/cocoon_upgrade/README.txt&r2=111200
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/README.txt	(original)
+++ forrest/trunk/etc/cocoon_upgrade/README.txt	Tue Dec  7 19:08:27 2004
@@ -4,25 +4,77 @@
 This directory contains files to help upgrade Cocoon to whatever is the latest
 version of Cocoon.
 
+Latest Release of Cocoon that has been incorporated (svn info):
+
+  URL: http://svn.apache.org/repos/asf/cocoon/trunk
+  Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+  Revision: 111170
+  Node Kind: directory
+  Schedule: normal
+  Last Changed Author: crossley
+  Last Changed Rev: 110094
+  Last Changed Date: 2004-12-06 22:48:05 -0800 (Mon, 06 Dec 2004)
+  Properties Last Updated: 2004-11-11 19:09:27 -0800 (Thu, 11 Nov 2004)
+
+
 Instructions for use:
 
-0) Follow the instructions to prepare and build a recent Cocoon:
-http://issues.apache.org/wiki/apachewiki.cgi?ForrestUpgradeLibs
+1.  cd $FORREST_HOME/etc/cocoon_upgrade
+
+2.  Two choices here to deal with the local.*.properties files that
+    cocoon uses:
+
+    (a) cp local.build.properties $COCOON_HOME/
+        cp local.blocks.properties $COCOON_HOME/
+
+    or it may be easier to apply a patch of the differences between
+    the local.*.properties files and the original properties files
+    they were based on. Which brings us to option:
+
+    (b) diff -u build.properties local.build.properties > ~/x
+        cd $COCOON_HOME
+        cp build.properties local.build.properties
+        patch -p0 $COCOON_HOME/local.build.properties < ~/x
+
+        cd $FORREST_HOME/etc/cocoon_upgrade
+        diff -u blocks.properties local.blocks.properties > ~/x
+        cd $COCOON_HOME
+        cp blocks.properties local.blocks.properties
+        patch -p0 $COCOON_HOME/local.blocks.properties < ~/x
+
+3.  cd $COCOON_HOME
+
+    Build cocoon in the usual way.
+
+4.  cd $FORREST_HOME/etc/cocoon_upgrade
+
+5.  Edit the upgrade_cocoon_jars.sh
+
+    Set the environment variables in the "MUST BE OVERRIDDEN" and the
+    "CAN BE OVERRIDDEN" sections.
+
+6.  ./upgrade_cocoon_jars.sh
+
+7.  cd $FORREST_HOME/lib
+
+8.  We need to make sure there is a license.txt file for each of the
+    jars that we have in the lib/* directories.
+
+    svn status | grep '^!' | grep 'license.txt'
+
+    If the removed license.txt file listed above matches a jar
+    that we have, then revert the deletetion by doing an
+
+      svn revert some.jar.license.txt
 
-1) In the Forrest root directory, run:
+    Otherwise, copy the relavent license.txt file from $COCOON_HOME/legal.
 
-  patch -p0 < etc/cocoon_upgrade/cocoon_upgradepatch*
+9.  cd $FORREST_HOME/main
 
-Which will make any required patches to the Forrest sources.
+10. Build a regular forrest distribution and test, test test.
 
-2) Edit upgrade_cocoon_jars.sh and modify the variables at the top of the file.
-(Beware: This has not yet been updated for the recent Forrest.
- So it is probably better to use "testing" and do the rest manually.)
-You'll need to specify locations for Cocoon, Nekopull and Nekodtd.  Also,
-decide what 'type' of upgrade you wish to perform:
- - 'testing': Copies upgraded jars to build/dist/shbat/*.  This is for testing
-   a Cocoon upgrade, and is the default
- - 'real': Copies upgraded jars to their official lib/* locations, and 'cvs
-   add's them.
+    The testing should consist of doing a "forrest site", "forrest run"
+    and "forrest war" against existing forrest projects and also against
+    new "forrest seed" sites.
 
-3) Run build.sh to build a regular Forrest distribution
+11. Update the cocoon "svn info" at the top of this README.txt

Added: forrest/trunk/etc/cocoon_upgrade/blocks.properties
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/blocks.properties?view=auto&rev=111200
==============================================================================
--- (empty file)
+++ forrest/trunk/etc/cocoon_upgrade/blocks.properties	Tue Dec  7 19:08:27 2004
@@ -0,0 +1,170 @@
+
+#  Copyright 1999-2004 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
+#
+#      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 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.
+
+# 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.
+
+
+# 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", "scratchpad", "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".
+#include.block.databases=false
+#-----[dependency]: "fop" depends on "batik".
+#-----[dependency]: "fop" is needed by "tour".
+#include.block.fop=false
+#-----[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
+#include.block.itext=false
+#include.block.jfor=false
+#include.block.jsp=false
+#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
+#include.block.paranoid=false
+#include.block.poi=false
+#-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".
+#-----[dependency]: "portal" is needed by "faces".
+#include.block.portal=false
+#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", "scratchpad".
+#include.block.velocity=false
+#include.block.web3=false
+#-----[dependency]: "xmldb" depends on "databases".
+#include.block.xmldb=false
+#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache", "forms", "lucene", "python", "scratchpad", "session-fw", "woody".
+#include.block.xsp=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]: "apples" depends on "forms" (for samples).
+#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".
+#include.block.cron=false
+#include.block.deli=false
+#-----[dependency]: "eventcache" depends on "jms", "xsp" (for samples).
+#-----[dependency]: "eventcache" is needed by "repository".
+#include.block.eventcache=false
+#-----[dependency]: "faces" depends on "portal", "taglib".
+#-----[dependency]: "faces" is needed by "scratchpad".
+#include.block.faces=false
+#-----[dependency]: "forms" depends on "xsp" (for samples).
+#-----[dependency]: "forms" is needed by "apples", "javaflow", "lucene", "ojb", "petstore", "querybean", "tour".
+#include.block.forms=false
+#-----[dependency]: "javaflow" depends on "forms", "ojb" (for samples).
+#-----[dependency]: "javaflow" is needed by "scratchpad".
+#include.block.javaflow=false
+#-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb" (for samples).
+#-----[dependency]: "jms" is needed by "eventcache", "slide".
+#include.block.jms=false
+#include.block.linotype=false
+#-----[dependency]: "mail" depends on "asciiart", "scratchpad".
+#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".
+#include.block.querybean=false
+#-----[dependency]: "repository" depends on "databases" (for samples), "eventcache".
+#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
+#include.block.repository=false
+#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for samples), "cron", "faces" (for samples), "javaflow", "repository", "velocity" (for samples), "xsp".
+#-----[dependency]: "scratchpad" is needed by "mail".
+#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
+#include.block.template=false
+#-----[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.
+
+#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
+include.block.portal-fw=false
+#-----[dependency]: "woody" depends on "xsp" (for samples).
+include.block.woody=false

Added: forrest/trunk/etc/cocoon_upgrade/build.properties
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.properties?view=auto&rev=111200
==============================================================================
--- (empty file)
+++ forrest/trunk/etc/cocoon_upgrade/build.properties	Tue Dec  7 19:08:27 2004
@@ -0,0 +1,193 @@
+#  Copyright 1999-2004 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
+#
+#      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.documentation=true
+#exclude.webapp.javadocs=true
+#exclude.webapp.samples=true
+#exclude.webapp.test-suite=true
+
+# ---- Build Exclusions --------------------------------------------------------
+
+#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 -----------------------------------------------------------
+
+#include.driver.oracle=true
+#include.driver.postgre=true
+#include.driver.odbc=true
+#config.allow-reloads=true
+#config.enable-uploads=true
+
+# ---- Validation --------------------------------------------------------------
+
+#exclude.validate.config=true
+#exclude.validate.xdocs=true
+#exclude.validate.jars=true
+
+# ---- Forrest -----------------------------------------------------------------
+
+# set $FORREST_HOME and $PATH as instructed by Forrest
+
+# ---- 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
+
+# ---- JUnit -------------------------------------------------------------------
+
+junit.test.debugport=8000
+#junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase
+
+# ---- Build -------------------------------------------------------------------
+
+build.root=build
+build=${build.root}/${name}-${version}
+build.dest=${build}/classes
+build.mocks=${build}/mocks
+build.test=${build}/test
+build.test.output=${build.test}/output
+build.docs=${build}/docs
+build.docs.printer=${build}/printer-docs
+build.site=${build}/site
+build.xdocs=${build}/xdocs
+build.javadocs=${build}/javadocs
+build.context=${build}/documentation
+build.context.printer=${build}/printer-documentation
+build.blocks=${build}/blocks
+build.deprecated=${build}/deprecated
+build.samples=${build}/samples
+build.temp=${build}/temp
+build.mounttable=../../mount-table.xml
+
+build.docs.loglevel=ERROR
+build.docs.printer.loglevel=ERROR
+
+# ------ Webapp Build Properties -----------------------------------------------
+
+build.webapp=${build.root}/webapp
+build.webapp.webinf=${build.webapp}/WEB-INF
+build.webapp.classes=${build.webapp.webinf}/classes
+build.webapp.lib=${build.webapp.webinf}/lib
+build.webapp.samples=${build.webapp}/samples
+build.webapp.test-suite=${build.webapp}/test-suite
+build.webapp.docs=${build.webapp}/docs
+build.webapp.javadocs=${build.webapp}/api/java
+build.webapp.loglevel=INFO
+build.war=${build}/${name}.war
+
+# ------ Standalone-demo Build Properties --------------------------------------
+build.standalone.demo=${build.root}/standalone-demo
+
+# ---- Compilation -------------------------------------------------------------
+
+compiler=modern
+compiler.debug=on
+compiler.optimize=on
+compiler.deprecation=off
+compiler.nowarn=on
+source.vm=1.3
+
+
+# ------ 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
+# you're doing.
+
+packages=org.apache
+
+# Project descriptor
+gump.descriptor=gump.xml
+
+# Directory Layout
+src=src
+src.core=${src}/core/java
+src.core.test=${src}/core/test
+java=${src}/java
+mocks=${src}/mocks
+test=${src}/test
+resources=${src}/resources
+resources.styles=${resources}/styles
+resources.logos=${resources}/logos
+resources.javadoc=${resources}/javadoc
+documentation=${src}/documentation
+docs=${documentation}/xdocs
+images=${documentation}/images
+blocks=${src}${file.separator}blocks
+samples=${src}/samples
+webapp=${src}/webapp
+webapp.samples=${webapp}/samples
+webapp.test-suite=${webapp}/test-suite
+customconf=${src}/confpatch
+
+# Deprecated Stuff
+deprecated=${src}/deprecated
+deprecated.src=${deprecated}/java
+deprecated.conf=${deprecated}/conf
+
+# Tools
+tools=tools
+tools.lib=${tools}/lib
+tools.src=${tools}/src
+tools.tasks.src=${tools.src}/anttasks
+tools.tasks.dest=${tools}/anttasks
+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
+lib.core=${lib}/core
+lib.endorsed=${lib}/endorsed
+lib.optional=${lib}/optional
+lib.local=${lib}/local
+
+# Distribution Directories
+dist.root=dist
+dist=${dist.root}/${name}-${version}
+dist.name=${name}-${version}
+dist.target=${dist.root}
+
+# Site Directory
+site=../cocoon-site/site/2.1
+
+# Legal
+legal=legal

Modified: forrest/trunk/etc/cocoon_upgrade/local.blocks.properties
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/local.blocks.properties?view=diff&rev=111200&p1=forrest/trunk/etc/cocoon_upgrade/local.blocks.properties&r1=111199&p2=forrest/trunk/etc/cocoon_upgrade/local.blocks.properties&r2=111200
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.blocks.properties	(original)
+++ forrest/trunk/etc/cocoon_upgrade/local.blocks.properties	Tue Dec  7 19:08:27 2004
@@ -47,7 +47,7 @@
 #-----[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".
+#-----[dependency]: "batik" is needed by "fop", "scratchpad", "tour".
 include.block.batik=true
 include.block.bsf=false
 #-----[dependency]: "chaperon" depends on "xsp" (for samples).
@@ -56,37 +56,38 @@
 #-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", "petstore", "repository", "xmldb".
 include.block.databases=false
 #-----[dependency]: "fop" depends on "batik".
+#-----[dependency]: "fop" is needed by "tour".
 include.block.fop=true
 #-----[dependency]: "hsqldb" depends on "databases".
-#-----[dependency]: "hsqldb" is needed by "jms", "petstore".
+#-----[dependency]: "hsqldb" is needed by "jms", "ojb", "petstore".
 include.block.hsqldb=false
 #-----[dependency]: "html" is needed by "portal".
 include.block.html=true
 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 "forms" (for samples), "xsp" (for samples).
+#-----[dependency]: "lucene" is needed by "querybean".
 include.block.lucene=true
 include.block.naming=false
 include.block.paranoid=false
-include.block.php=false
 include.block.poi=false
-#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
-include.block.portal-fw=false
+#-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".
+#-----[dependency]: "portal" is needed by "faces".
+include.block.portal=false
 include.block.profiler=true
 #-----[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
-include.block.swf=false
 #-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
 include.block.velocity=false
 include.block.web3=false
 #-----[dependency]: "xmldb" depends on "databases".
 include.block.xmldb=false
-#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache", "forms", "linkrewriter", "python", "scratchpad", "session-fw", "woody".
+#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache", "forms", "lucene", "python", "scratchpad", "session-fw", "woody".
 include.block.xsp=true
 
 # Unstable blocks --------------------------------------------------------------
@@ -103,45 +104,56 @@
 include.block.apples=false
 #-----[dependency]: "asciiart" is needed by "mail".
 include.block.asciiart=true
+#-----[dependency]: "axis" is needed by "scratchpad".
 include.block.axis=false
 #-----[dependency]: "cron" is needed by "scratchpad".
 include.block.cron=false
 include.block.deli=false
-#-----[dependency]: "eventcache" depends on "xsp" (for samples).
-#-----[dependency]: "eventcache" is needed by "jms", "repository".
+#-----[dependency]: "eventcache" depends on "jms", "xsp" (for samples).
+#-----[dependency]: "eventcache" is needed by "repository".
 include.block.eventcache=false
+#-----[dependency]: "faces" depends on "portal", "taglib".
+#-----[dependency]: "faces" is needed by "scratchpad".
+include.block.faces=false
 #-----[dependency]: "forms" depends on "xsp" (for samples).
-#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore".
+#-----[dependency]: "forms" is needed by "apples", "javaflow", "lucene", "ojb", "petstore", "querybean", "tour".
 include.block.forms=false
-#-----[dependency]: "javaflow" depends on "forms", "ojb".
+#-----[dependency]: "javaflow" depends on "forms", "ojb" (for samples).
+#-----[dependency]: "javaflow" is needed by "scratchpad".
 include.block.javaflow=false
-#-----[dependency]: "jms" depends on "databases" (for samples), "eventcache", "hsqldb".
-#-----[dependency]: "jms" is needed by "slide".
+#-----[dependency]: "jms" depends on "databases" (for samples), "hsqldb" (for samples).
+#-----[dependency]: "jms" is needed by "eventcache", "slide".
 include.block.jms=false
 include.block.linotype=false
 #-----[dependency]: "mail" depends on "asciiart", "scratchpad".
 include.block.mail=false
 include.block.midi=false
-#-----[dependency]: "ojb" depends on "databases", "forms" (for samples).
+#-----[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
-#-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".
-include.block.portal=false
 include.block.proxy=false
 include.block.qdox=false
-#-----[dependency]: "repository" depends on "databases", "eventcache".
-#-----[dependency]: "repository" is needed by "slide", "webdav".
+#-----[dependency]: "querybean" depends on "forms" (for samples), "lucene".
+include.block.querybean=false
+#-----[dependency]: "repository" depends on "databases" (for samples), "eventcache".
+#-----[dependency]: "repository" is needed by "scratchpad", "slide", "webdav".
 include.block.repository=false
-#-----[dependency]: "scratchpad" depends on "batik" (for samples), "cron", "velocity", "xsp".
+#-----[dependency]: "scratchpad" depends on "axis" (for samples), "batik" (for samples), "cron", "faces" (for samples), "javaflow", "repository", "velocity" (for samples), "xsp".
 #-----[dependency]: "scratchpad" is needed by "mail".
 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
+include.block.template=false
+#-----[dependency]: "tour" depends on "batik", "fop", "forms", "slop".
+include.block.tour=false
 #-----[dependency]: "webdav" depends on "repository".
 include.block.webdav=false
 
@@ -152,5 +164,7 @@
 # For including one of them you have to set the exclude property into comment in
 # blocks.properties.
 
+#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
+include.block.portal-fw=false
 #-----[dependency]: "woody" depends on "xsp" (for samples).
 include.block.woody=false

Modified: forrest/trunk/etc/cocoon_upgrade/local.build.properties
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/local.build.properties?view=diff&rev=111200&p1=forrest/trunk/etc/cocoon_upgrade/local.build.properties&r1=111199&p2=forrest/trunk/etc/cocoon_upgrade/local.build.properties&r2=111200
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/local.build.properties	(original)
+++ forrest/trunk/etc/cocoon_upgrade/local.build.properties	Tue Dec  7 19:08:27 2004
@@ -26,12 +26,17 @@
 exclude.webapp.documentation=true
 exclude.webapp.javadocs=true
 #exclude.webapp.samples=true
+exclude.webapp.test-suite=true
 
 # ---- Build Exclusions --------------------------------------------------------
 
 #exclude.deprecated=true
 exclude.documentation=true
 exclude.javadocs=true
+# Include Java source code into the binary jar files
+include.sources-in-jars=false
+# Include Java source code into separate, source only jar files
+include.sources-jars=false
 
 # ---- Configuration -----------------------------------------------------------
 
@@ -62,6 +67,11 @@
 # disable some long-running tests by default
 # anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
 
+# ---- JUnit -------------------------------------------------------------------
+
+junit.test.debugport=8000
+#junit.testcase=org.apache.cocoon.util.test.NetUtilsTestCase
+
 # ---- Build -------------------------------------------------------------------
 
 build.root=build
@@ -69,6 +79,7 @@
 build.dest=${build}/classes
 build.mocks=${build}/mocks
 build.test=${build}/test
+build.test.output=${build.test}/output
 build.docs=${build}/docs
 build.docs.printer=${build}/printer-docs
 build.site=${build}/site
@@ -92,6 +103,7 @@
 build.webapp.classes=${build.webapp.webinf}/classes
 build.webapp.lib=${build.webapp.webinf}/lib
 build.webapp.samples=${build.webapp}/samples
+build.webapp.test-suite=${build.webapp}/test-suite
 build.webapp.docs=${build.webapp}/docs
 build.webapp.javadocs=${build.webapp}/api/java
 build.webapp.loglevel=INFO
@@ -103,10 +115,11 @@
 # ---- Compilation -------------------------------------------------------------
 
 compiler=modern
-compiler.debug=off
+compiler.debug=on
 compiler.optimize=on
 compiler.deprecation=off
 compiler.nowarn=on
+source.vm=1.3
 
 
 # ------ System Properties -----------------------------------------------------
@@ -122,6 +135,8 @@
 
 # Directory Layout
 src=src
+src.core=${src}/core/java
+src.core.test=${src}/core/test
 java=${src}/java
 mocks=${src}/mocks
 test=${src}/test
@@ -136,6 +151,7 @@
 samples=${src}/samples
 webapp=${src}/webapp
 webapp.samples=${webapp}/samples
+webapp.test-suite=${webapp}/test-suite
 customconf=${src}/confpatch
 
 # Deprecated Stuff

Modified: forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
Url: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh?view=diff&rev=111200&p1=forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh&r1=111199&p2=forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh&r2=111200
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	(original)
+++ forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	Tue Dec  7 19:08:27 2004
@@ -17,24 +17,26 @@
 ######################################################################
 # A script for upgrading Forrest's jars with those from Cocoon.  Use at own
 # risk!  Make sure you build Cocoon before running this.  If your cocoon-2.1
-# directory is not on the same level as xml-forrest/, set the COCOON_HOME variable
-# below.
-#
+# directory is not on the same level as xml-forrest/, set the COCOON_HOME
+# variable below.
+
 cd $PWD/../../../../
 BASE=$PWD/`dirname $0`
+
 ## MUST BE OVERRIDDEN:
 COCOON_VERSION=2.2.0-dev
-COCOON_HOME=$BASE/cocoon/trunk
-FORREST=$BASE/forrest/trunk
+COCOON_HOME=$BASE/cocoon/2.2
+FORREST=$BASE/forrest/van
+
+## CAN BE OVERRIDDEN:
+JARSUFFIX=${COCOON_VERSION}-r111170
+
+## Not necessary, at least for Cocoon 2.2.x
 NEKODTD_VERSION=0.1.10
 NEKODTD_HOME=$BASE/nekodtd-$NEKODTD_VERSION
 NEKOPULL_VERSION=0.2.4
 NEKOPULL_HOME=$BASE/nekopull-$NEKOPULL_VERSION
 
-## CAN be overridden:
-#JARSUFFIX=`date +%Y%m%d`
-JARSUFFIX=$COCOON_VERSION
-
 ## We need to identify the old Cocoon jar amongst all the others.  This pattern
 ## identifies it.  By default, we assume a date (see $JARSUFFIX) was used
 COCOONJAR_SUFFIX="[0-9]*"
@@ -62,11 +64,21 @@
   checkdir "$FORREST" FORREST
   checkdir "$COCOON_HOME" COCOON_HOME
   checkdir "$FLIB" FLIB
-  checkdir "$NEKODTD_HOME" NEKODTD_HOME
-  checkdir "$NEKOPULL_HOME" NEKOPULL_HOME
+#  checkdir "$NEKODTD_HOME" NEKODTD_HOME
+#  checkdir "$NEKOPULL_HOME" NEKOPULL_HOME
 #
 }
 
+function remove()
+{
+  echo -n "Removing:            $1              "
+  push
+  cd $FLIB
+  rm $1*
+  pop
+  echo "done."
+}
+
 function copy()
 {
   echo -n "Copying jar:		$1		"
@@ -158,7 +170,9 @@
 #copy_local_properties
 #build_cocoon
 
-upgrade_neko
+# Let's get rid of jars / licenses unused in latest version of cocoon
+remove jcs
+
 upgrade_endorsed
 
 #set -vx
@@ -191,8 +205,6 @@
 bzcopy lucene
 #cocoon-profiler-block-20030311.jar
 bzcopy profiler
-#jakarta-bcel needed by the wiki stuff
-copy jakarta-bcel
 #commons-collections-2.1.jar
 copy commons-collections
 #commons-jxpath-1.1b1.jar
@@ -202,7 +214,7 @@
 #excalibur-cli-1.0.jar
 copy commons-cli
 #excalibur-component-20020916.jar
-copy excalibur-component
+#copy excalibur-component
 #excalibur-concurrent-20020820.jar
 #copy excalibur-concurrent
 copy util.concurrent
@@ -218,7 +230,7 @@
 #excalibur-logger-20020820.jar
 copy excalibur-logger
 #excalibur-monitor-20020820.jar
-copy excalibur-monitor
+#copy excalibur-monitor
 #excalibur-naming-1.0.jar
 copy excalibur-naming
 #excalibur-pool-20020820.jar
@@ -233,11 +245,11 @@
 #bcopy fop
 #jakarta-oro-2.0.6.jar
 #jakarta-regexp-1.2.jar
-copy jakarta-regexp
+#copy jakarta-regexp
 # We'll keep our own jing thankyou
 #copy jing
 # jcs-1.0-dev-20040516.jar
-copy jcs
+#copy jcs
 #commons-logging-1.0.3.jar needed by jcs
 copy commons-logging
 #jtidy-04aug2000r7-dev.jar
@@ -249,13 +261,13 @@
 #nekodtd-20020615.jar
 #nekopull.jar
 copy xml-commons-resolver
+copy ehcache
 #xml-forrest-components.jar
 #xml-forrest-scratchpad.jar
 
 
 #######
 # New jars not in the 2003-03-11 snapshot
-copy excalibur-event
 copy util.concurrent
 
 if [ "$UPGRADE_TYPE" = "real_with_cvs" ]; then
@@ -282,5 +294,10 @@
 echo "All done.  Upgraded Cocoon jars copied to:"
 echo "  $FLIB"
 echo "  $FLIB_ENDORSED"
+
+echo
+echo "Please check that licenses for each of the jars exist along side"
+echo "the jars in lib/core and lib/endorsed."
+echo
 
 # vim: set noexpandtab list:

Added: forrest/trunk/lib/core/cocoon-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-20041018-r54993.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-20041018-r54993.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-asciiart-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-batik-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-chaperon-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-deprecated-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-deprecated-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-deprecated-20041018-r54993.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-deprecated-20041018-r54993.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-fop-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-html-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-lucene-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-profiler-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev-r111170.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev-r111170.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Deleted: /forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/cocoon-xsp-block-2.2.0-dev.jar?view=auto&rev=111199
==============================================================================

Added: forrest/trunk/lib/core/ehcache-1.0.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/ehcache-1.0.jar?view=auto&rev=111200
==============================================================================
Binary file. No diff available.

Added: forrest/trunk/lib/core/ehcache-1.0.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/ehcache-1.0.jar.license.txt?view=auto&rev=111200
==============================================================================
--- (empty file)
+++ forrest/trunk/lib/core/ehcache-1.0.jar.license.txt	Tue Dec  7 19:08:27 2004
@@ -0,0 +1,57 @@
+/*
+ * $Id: LICENSE.txt,v 1.3 2004/03/19 10:31:14 gregluck Exp $
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2003 - 2004 Greg Luck.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by Greg Luck
+ *       (http://sourceforge.net/users/gregluck) and contributors.
+ *       See http://sourceforge.net/project/memberlist.php?group_id=93232
+ *       for a list of contributors"
+ *    Alternately, this acknowledgement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "EHCache" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For written
+ *    permission, please contact Greg Luck (gregluck at users.sourceforge.net).
+ *
+ * 5. Products derived from this software may not be called "EHCache"
+ *    nor may "EHCache" appear in their names without prior written
+ *    permission of Greg Luck.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL GREG LUCK OR OTHER
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by contributors
+ * individuals on behalf of the EHCache project.  For more
+ * information on EHCache, please see <http://ehcache.sourceforge.net/>.
+ *
+ */

Deleted: /forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar?view=auto&rev=111199
==============================================================================

Deleted: /forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrument-manager-1.0.jar.license.txt?view=auto&rev=111199
==============================================================================

Deleted: /forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar?view=auto&rev=111199
==============================================================================

Deleted: /forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/excalibur-instrument-manager-interfaces-1.0.jar.license.txt?view=auto&rev=111199
==============================================================================

Deleted: /forrest/trunk/lib/core/jcs-1.1-dev-20040811.jar
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/jcs-1.1-dev-20040811.jar?view=auto&rev=111199
==============================================================================

Deleted: /forrest/trunk/lib/core/jcs-1.1-dev.20040811.jar.license.txt
Url: http://svn.apache.org/viewcvs/forrest/trunk/lib/core/jcs-1.1-dev.20040811.jar.license.txt?view=auto&rev=111199
==============================================================================

Modified: forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/AbstractNode.java	Tue Dec  7 19:08:27 2004
@@ -19,7 +19,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
@@ -72,8 +71,8 @@
             final String value = children[i].getAttribute("value");
             try {
                 parameters.put(
-                    VariableResolverFactory.getResolver(name, new WrapperComponentManager(m_manager)),
-                    VariableResolverFactory.getResolver(value, new WrapperComponentManager(m_manager)));
+                    VariableResolverFactory.getResolver(name, m_manager),
+                    VariableResolverFactory.getResolver(value, m_manager));
             } catch(PatternException pe) {
                 String msg = "Invalid pattern '" + value + "' at " 
                     + children[i].getLocation();
@@ -118,4 +117,4 @@
     
     public abstract String locate(Map objectModel, InvokeContext context) throws Exception;
         
-}
\ No newline at end of file
+}

Modified: forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocationNode.java	Tue Dec  7 19:08:27 2004
@@ -17,7 +17,6 @@
 
 import java.util.Map;
 
-import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -50,8 +49,7 @@
     public void build(final Configuration configuration) throws ConfigurationException {
         try {
             m_src = VariableResolverFactory.getResolver(
-            		configuration.getAttribute("src"), 
-					new WrapperComponentManager(super.m_manager));
+            		configuration.getAttribute("src"), super.m_manager);
         } catch (PatternException e) {
             final String message = "Illegal pattern syntax at for location attribute 'src'" +
             		" at " + configuration.getLocation();

Modified: forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/components/modules/input/lm/LocatorNode.java	Tue Dec  7 19:08:27 2004
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.avalon.framework.component.WrapperComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -67,7 +66,7 @@
         String base = configuration.getAttribute("base", null);
         if (base != null) {
             try {
-                m_baseLocation = VariableResolverFactory.getResolver(base, new WrapperComponentManager(super.m_manager));
+                m_baseLocation = VariableResolverFactory.getResolver(base, super.m_manager);
             } catch (PatternException e) {
                 final String message = "Illegal pattern syntax for locator attribute 'base'" +
                 		" at " + configuration.getLocation();
@@ -139,4 +138,4 @@
         return m_lm.getDefaultSelector();
     }
     
-}
\ No newline at end of file
+}

Modified: forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/selection/SourceExistsSelector.java	Tue Dec  7 19:08:27 2004
@@ -20,17 +20,17 @@
 
 import java.io.IOException;
 
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.Serviceable;
+
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.component.Composable;
 
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-
 /**
  * Selects the first of a set of Sources that exists in the context.
  * <p>
@@ -57,7 +57,7 @@
  * </pre>
  */
 public class SourceExistsSelector extends AbstractLogEnabled
-  implements ThreadSafe, Selector, Composable {
+  implements ThreadSafe, Selector, Serviceable {
 
     SourceResolver resolver = null;
 
@@ -65,7 +65,7 @@
      * Set the current <code>ComponentManager</code> instance used by this
      * <code>Composable</code>.
      */
-    public void compose(ComponentManager manager) throws ComponentException {
+    public void service(ServiceManager manager) throws ServiceException {
         this.resolver = (SourceResolver)manager.lookup(SourceResolver.ROLE);
     }
 

Modified: forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/transformation/IdGeneratorTransformer.java	Tue Dec  7 19:08:27 2004
@@ -21,11 +21,12 @@
 import java.util.Map;
 
 import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.SourceResolver;
@@ -129,8 +130,8 @@
         */
     }
 
-    public void compose(ComponentManager manager) {
-        super.compose(manager);
+    public void service(ServiceManager manager) throws ServiceException {
+        super.service(manager);
         try {
             this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
         } catch (Exception e) {

Modified: forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java
Url: http://svn.apache.org/viewcvs/forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java?view=diff&rev=111200&p1=forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java&r1=111199&p2=forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java&r2=111200
==============================================================================
--- forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java	(original)
+++ forrest/trunk/main/java/org/apache/cocoon/transformation/XPathTransformer.java	Tue Dec  7 19:08:27 2004
@@ -20,8 +20,9 @@
 import java.util.Map;
 import java.util.Stack;
 
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.environment.SourceResolver;
@@ -101,8 +102,8 @@
         }
 
 
-    public void compose(ComponentManager manager) {
-        super.compose(manager);
+    public void service(ServiceManager manager) throws ServiceException {
+        super.service(manager);
         try {
             this.processor = (XPathProcessor)this.manager.lookup(XPathProcessor.ROLE);
         } catch (Exception e) {

Mime
View raw message