Return-Path: X-Original-To: apmail-cocoon-dev-archive@www.apache.org Delivered-To: apmail-cocoon-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 290A473FA for ; Thu, 29 Dec 2011 11:03:23 +0000 (UTC) Received: (qmail 48848 invoked by uid 500); 29 Dec 2011 11:03:22 -0000 Delivered-To: apmail-cocoon-dev-archive@cocoon.apache.org Received: (qmail 48784 invoked by uid 500); 29 Dec 2011 11:03:22 -0000 Mailing-List: contact dev-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@cocoon.apache.org List-Id: Delivered-To: mailing list dev@cocoon.apache.org Received: (qmail 48777 invoked by uid 99); 29 Dec 2011 11:03:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2011 11:03:21 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of scherler@gmail.com designates 209.85.216.44 as permitted sender) Received: from [209.85.216.44] (HELO mail-qw0-f44.google.com) (209.85.216.44) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Dec 2011 11:03:15 +0000 Received: by qadb15 with SMTP id b15so7804997qad.3 for ; Thu, 29 Dec 2011 03:02:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:date:in-reply-to:references:content-type :x-mailer:content-transfer-encoding:mime-version; bh=GKtt/YW+oxVI1MsCXtjvGTfQO/h3+Nn0xC8jwmsT1sg=; b=pKIyeYbC6gXMgVjdo0z1SGom+RAM6nJbleBruzaAIkNpH5X4ohaQSJbJrqunoZSP66 bWmkyKs5xA9i3zebufa7n73/a+HXM7lQDzn5aAiZp/YOzGDKSTa72HhvM8ys7ovxSCke QRkO6wrNblA4VFsf3ut+f5N/KSn0cFE0ZFwko= Received: by 10.224.32.16 with SMTP id a16mr41792092qad.85.1325156574830; Thu, 29 Dec 2011 03:02:54 -0800 (PST) Received: from [10.0.0.16] (94.168.216.87.static.jazztel.es. [87.216.168.94]) by mx.google.com with ESMTPS id el3sm775529qab.8.2011.12.29.03.02.51 (version=SSLv3 cipher=OTHER); Thu, 29 Dec 2011 03:02:53 -0800 (PST) Message-ID: <1325156570.11045.15.camel@mcKenny> Subject: Re: [C3] Import subprojects proposal [WAS: Re: [c3] Log4j injection in target of blocks] From: Thorsten Scherler To: dev@cocoon.apache.org Date: Thu, 29 Dec 2011 12:02:50 +0100 In-Reply-To: <4EF5FECB.4080503@apache.org> References: <1322145959.4932.25.camel@mcKenny> <4ECF4E0D.2010200@apache.org> <1322213658.9894.6.camel@mcKenny> <4ED0FB57.3050204@apache.org> <1322351909.5218.14.camel@mcKenny> <4EF5FECB.4080503@apache.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 8bit Mime-Version: 1.0 On Sat, 2011-12-24 at 17:33 +0100, Francesco Chicchiriccò wrote: > On 01/12/2011 21:47, Simone Tripodi wrote: > > Hi all guys! > > > > Apologies for the lack of participations but looks like contributing in more ASF communities requires a lot of time! :) > > > > My position are: > > > > * +1 on migrating old components - that's true that we could maintain them in their proper branch, but at the same time they would need an update to be more compliant with C3 - moreover, since we agreed on migrating to Java6, it would worth started getting advantage from the new platform - that would imply "subprojects" actualization. > > > > * +1 on restructuring the svn, I would like to restructure anyway the C3 first: IMHO having all the modules in a flat structures starts being a little confusing, even to me that I'm involved, I would suggest to move to a different hierarchical structure, grouping modules by technology/extension type/application type. > > Moreover IMHO the 'optional' module should be split, it contains now a lot of good reusable - more that at the begin - stuff that we could consider as a collection of modules. > > Of course, we have to pay attention to not overengineering. > > I would suggest as well to open a Sandbox open to all ASF committers to experiment new modules. > > > > My proposal is considering the two topics separately, I would like Francesco lead the topic #1, I can prepare during the weekend a proposal on how to restructure the SVN. > > Hi all, > first of all, apologies for delay :-) > > Here it follows some results from my investigation of our current SVN > repository ("from root to branches" someone would have said...) and also > a proposal of mine for making things a bit easier to work with. > > I'll take the current structure at > https://svn.apache.org/repos/asf/cocoon/ as reference and base URL. > > */branches/* > Move current /trunk/ under here as BRANCH_2_2_X (similar to BRANCH_2_1_X > and others, already present) so that any further activity on C2.2 can > take place here. > > */cocoon3/* > Move /cocoon3/trunk as /trunk/ (Simone restructuring as presented above > will take place here) and /cocoon3/tags/** under /tags, possibly > refactoring paths like as > /cocoon3/tags/cocoon-archetype-block/cocoon-archetype-block-3.0.0-alpha-3/ > to simpler /tags/cocoon-archetype-block-3.0.0-alpha-3/ > > */site/* > Merge this with current /cocoon3/trunk/cocoon-docs > > */tags/* > As said above for /cocoon3, move /cocoon3/tags/* here, possibly > refactoring paths > > */trunk/* > As said above for /cocoon3, move /cocoon3/trunk/* here. > Then, copy current trunk/subprojects/ (i.e. > /branches/BRANCH_2_2_X/subprojects/ after refactoring): > cocoon-block-deployment/ > cocoon-configuration/ > cocoon-jnet/ > cocoon-servlet-service/ > cocoon-xml/ > Next, copy some modules from current trunk/tools/ (i.e. > /branches/BRANCH_2_2_X/tools/ after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin/ > cocoon-rcl/ > Finally, copy from current trunk/blocks/cocoon-serializers/ (i.e. > /branches/BRANCH_2_2_X/blocks/cocoon-serializers/ after refactoring): > cocoon-serializers-charsets/ > > All modules involved with C3 should have now their places under > /trunk/subprojects/ or /trunk/tools. If there is any module missing > please let me know. > > We will need, of course, to adapt all pom.xml's for working in the new > structure. > > WDYT? Not 100% sure. ATM we have: * branches/ * cocoon3/ * site/ * tags/ * trunk/ * whiteboard/ Which IMO should become: branches/ (2.X) site/ tags/ trunk/ (cocoon3/) whiteboard/ subprojects/ tools/ Where within subproject/tools we would apply the branches|tags|trunk structure. This way we can have a tag/branch for e.g. the cocoon-spring-configurator for the 2.2 deps and sub-trunk against our main-trunk. Further that would allow us to extract common code to a module in tools/subproject. Makes sense? Regarding site see David comment. The main problem here is that we have a wide range of build tools which originally build our docu (mainly forrest till now). However I am uncertain how we can manage the docu for the different versions. salu2 -- Thorsten Scherler codeBusters S.L. - web based systems http://www.codebusters.es/