Return-Path: 
 <dev-return-30216-apmail-forrest-dev-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-dev-archive@www.apache.org
Received: (qmail 22454 invoked from network); 15 Feb 2009 04:58:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Feb 2009 04:58:11 -0000
Received: (qmail 66464 invoked by uid 500); 15 Feb 2009 04:58:11 -0000
Delivered-To: apmail-forrest-dev-archive@forrest.apache.org
Received: (qmail 66440 invoked by uid 500); 15 Feb 2009 04:58:11 -0000
Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:dev-help@forrest.apache.org>
list-unsubscribe: <mailto:dev-unsubscribe@forrest.apache.org>
List-Post: <mailto:dev@forrest.apache.org>
Reply-To: dev@forrest.apache.org
List-Id: <dev.forrest.apache.org>
Delivered-To: mailing list dev@forrest.apache.org
Received: (qmail 66431 invoked by uid 99); 15 Feb 2009 04:58:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Feb 2009 20:58:10 -0800
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL
X-Spam-Check-By: apache.org
Received-SPF: neutral (athena.apache.org: local policy)
Received: from [66.111.4.29] (HELO out5.smtp.messagingengine.com)
 (66.111.4.29)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Feb 2009 04:58:03 +0000
Received: from compute1.internal (compute1.internal [10.202.2.41])
	by out1.messagingengine.com (Postfix) with ESMTP id 389DD293FD5
	for <dev@forrest.apache.org>; Sat, 14 Feb 2009 23:57:41 -0500 (EST)
Received: from heartbeat1.messagingengine.com ([10.202.2.160])
  by compute1.internal (MEProxy); Sat, 14 Feb 2009 23:57:41 -0500
X-Sasl-enc: v298xa+MCwa0/zJ7y7ESOmBHPtYELxIYx4oVSCeYmayp 1234673859
Received: from localhost (dsl-41-216.nsw1.net.au [125.168.41.216])
	by mail.messagingengine.com (Postfix) with ESMTPSA id 96B9F1362D
	for <dev@forrest.apache.org>; Sat, 14 Feb 2009 23:57:39 -0500 (EST)
Date: Sun, 15 Feb 2009 15:57:57 +1100
From: David Crossley <crossley@apache.org>
To: dev@forrest.apache.org
Subject: Re: [HeadsUp] next steps for dispatcher integration - please test
Message-ID: <20090215045757.GA3775@igg.indexgeo.com.au>
References: <1223555160.13993.177.camel@thorsten-desktop>
 <1234428667.6395.10.camel@panic>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1234428667.6395.10.camel@panic>
User-Agent: Mutt/1.4.2.3i
X-Virus-Checked: Checked by ClamAV on apache.org

Thorsten Scherler wrote:
> Thorsten Scherler wrote:
> > Hi all,
> > 
> > after an extended rewrite of the dispatcher I am happy to say that my
> > first tests are all passing now.
> > 
> > The upgrade steps for custom dispatcher projects are straightforward:
> > 1) Renaming extension of the contracts from *.ft to *.contracts.xml
> > demonstrated with http://svn.apache.org/viewcvs?view=rev&rev=701113
> > 
> > 2) Renaming elements from view to structurer
> > demonstrated with http://svn.apache.org/viewcvs?view=rev&rev=701117
> > 
> > 3) Renaming structurer file and adding new extension
> > demonstrated with http://svn.apache.org/viewcvs?view=rev&rev=701325
> > 
> > 4) The path of the defaultVariables has changed a bit. Removing one
> > level
> > demonstrated with http://svn.apache.org/viewcvs?view=rev&rev=703149
> > 
> > 5) [optional] Renaming extensions for contracts and structurer in
> > properties files.
> > demonstrated with http://svn.apache.org/viewcvs?view=rev&rev=701119
> > 
> > Step 5 is optional since in the normal use case one is using the default
> > configuration. However our fresh site sadly added the
> > "dispatcher.theme-ext" property. Just do:
> > -  <property name="dispatcher.theme-ext" value=".fv"/>
> > 
> > 
> > On my todo list still are two open points:
> > 1) Merge the cocoon-2.2 block dispatcher into the current plugin. This
> > needs extending the normal build of plugins since cocoon 2.2 needs
> > additional files in the resulting jar. 
> 
> That has be done as well.
> 
> > 2) Small document of the new features and how we can use them.
> 
> This still needs more work.
> 
> > Since I have done the whole work in a branch I need to merge it ASAP. I
> > suspect that the merge will not be fully conflict free since there has
> > been some commits to the trunk of contracts that are not in the branch.
> 
> Since I did not merged the branches right away the recent work of Gavin
> and David on the html/css validation compatibility is not incorporated
> when I simply merge the branches. Bummer.

I am no branching expert, but can you merge the changes from
trunk into your branch. When all is well you then merge
branch to trunk.

At the moment i don't have time to test, or to comment
on your plan. So i hope that other developers do.

-David

> IMO the best is to repeat the above steps on a clean new branch for the
> rewrite or even directly do it in trunk since the plugin should leave
> the whiteboard as well.
> 
> WDYT?
> 
> salu2