On Tue, Sep 3, 2013 at 5:19 PM, Guillaume "Louis-Marie" Delhumeau <[email protected]> wrote: > Hi devs! > > I have talked with Vincent about this. We have discovered some issues with > the organisation I have proposed. > > The main issue is that xwiki-entreprise-ui needs to attach > xwiki-entreprise-workspace-ui-all's xar into WorkspaceManager.Install (to > provide a default template), and xwiki-entreprise-workspace-ui-all is a > module of xwiki-entreprise-distribution. So there is a problem of > dependencies across the modules hierarchy and the build can't work. > > Moreover, it was not clear that xwiki-entreprise-ui was designed to be the > main wiki UI and xwiki-entreprise-workspace-ui the template UI for > subwiki. > > That's why we want to propose a new structure: > > xwiki-entreprise-ui (pom): > * xwiki-entreprise-ui-common (xar) > * xwiki-entreprise-ui-mainwiki (xar) > * xwiki-entreprise-ui-subwiki (xar) > * xwiki-entreprise-ui-mainwiki-all (all-in-one xar) > * xwiki-entreprise-ui-subwiki-all (all-in-one xar) > > xwiki-enterprise-distribution (pom): > * the same as current but without xwiki-entreprise-ui-all > > In this way we don't have the dependencies across modules problem, and it > is very clear what is the main wiki XAR and what is the subwiki XAR. > > In the xwiki-entreprise-ui-mainwiki's pom, we will put: > <xwiki.extension.features> > org.xwiki.enterprise:xwiki-enterprise-ui > </xwiki.extension.features> > in order to help the extensions manager retrieving the good XARs during an > upgrade. >
> But what about the Distribution Wizard? Do we have something special to add > in order to make xwiki-entreprise-ui-mainwiki the default XAR? See https://github.com/xwiki/xwiki-enterprise/blob/master/xwiki-enterprise-web/pom.xml#L43 Hope this helps, Marius > > I hope my email is clear and thanks you in advance for your suggestions, > > Guillaume > > > 2013/8/29 Guillaume "Louis-Marie" Delhumeau <[email protected]> > >> Hi devs. >> >> I made some modifications, it is not exactly the same as I proposed first, >> but I have all explained in the following JIRA: >> http://jira.xwiki.org/browse/XWIKI-9409 >> >> I have made a pull request for this work: >> https://github.com/xwiki/xwiki-enterprise/pull/39 >> >> I hope you like it. >> >> I won't work tomorrow, so enjoy a good week-end! >> >> Louis-Marie >> >> >> 2013/8/1 Eduard Moraru <[email protected]> >> >>> Actually I think I am the one that got confused because of the fact that >>> we >>> have both the current Workspace/WikiManager.Install way of doing things >>> (using the wiki-ui-all xar) and, as a next step, the EM way of doing >>> things >>> (using the wiki-ui xar). If enterprise-ui depends on wiki-ui and you >>> install it with EM it will be OK. I kept thinking of wiki-ui-all when >>> instead I should have thought about wiki-ui. >>> >>> That is what happens when you have to read between the lines :) Please try >>> to provide more details about *why* you are doing the proposed actions >>> instead of only listing *what* you plan to do. >>> >>> +1 to the initial proposal. No duplication of poms. >>> >>> Thanks and sorry for the noise, >>> Eduard >>> >>> >>> >>> On Thu, Aug 1, 2013 at 4:13 PM, Guillaume "Louis-Marie" Delhumeau < >>> [email protected]> wrote: >>> >>> > Eddy, >>> > >>> > About 3: >>> > >>> > In my first implementation, I wanted to make xwiki-enterprise-ui >>> depends on >>> > xwiki-enterprise-wiki-ui because for me, the main wiki is like a subwiki >>> > PLUS some specific pages. There is no page of the subwiki that I don't >>> want >>> > to have on the main wiki. >>> > >>> > But it is only because it is what we have now. >>> > >>> > Now I understand that if we really want to have distinct XARs, this >>> > dependency is a problem. >>> > >>> > My purpose was also to avoid maintaning 2 pom files. If I create a new >>> > module that I want to have in both XARS, I just have to add it to the >>> > wiki-ui pom.xml. >>> > >>> > But I guess it is a mistake. >>> > >>> > -------- >>> > New proposal : >>> > >>> > 1/ Create a subproject *xwiki-enterprise-workspace-ui*, which defines >>> what >>> > a workspace should be. >>> > 1bis/ Create a *xwiki-enterprise-workspace-ui-all* too, in * >>> > xwiki-enterprise-distribution* >>> > >>> > 2/ Create a subproject *xwiki-enterprise-wiki-ui*, which defines what a >>> > subwiki should be. >>> > 2bis/ Create a *xwiki-enterprise-wiki-ui-all* too, in * >>> > xwiki-enterprise-distribution* >>> > >>> > BTW it make sense only if we want to keep the distinction between >>> subwikis >>> > and workspaces. >>> > >>> > 3/ Maintain the 3 poms: *xwiki-enterprise-workspace-ui, >>> > **xwiki-enterprise-workspace-ui >>> > *AND* **xwiki-enterprise-ui* when you want to add a module for all the >>> > wikis. >>> > >>> > Thanks Edy for your remarks, that I think I now understand. >>> > >>> > WDYT ? >>> > >>> > Thanks, >>> > Guillaume D aka Louis-Marie >>> > >>> > 2013/7/31 Eduard Moraru <[email protected]> >>> > >>> > > Yep, got that too. Anyway, I`ll wait for the pull request/merge >>> instead >>> > of >>> > > creating noise on the list :) >>> > > >>> > > Thanks, >>> > > Eduard >>> > > >>> > > >>> > > On Wed, Jul 31, 2013 at 7:43 PM, Thomas Mortagne >>> > > <[email protected]>wrote: >>> > > >>> > > > On Wed, Jul 31, 2013 at 5:32 PM, Eduard Moraru < >>> [email protected]> >>> > > > wrote: >>> > > > > On Wed, Jul 31, 2013 at 12:03 PM, Guillaume "Louis-Marie" >>> Delhumeau < >>> > > > > [email protected]> wrote: >>> > > > > >>> > > > >> Hi Edy >>> > > > >> >>> > > > >> 2013/7/30 Eduard Moraru <[email protected]> >>> > > > >> >>> > > > >> > Hi, >>> > > > >> > >>> > > > >> > I suggest using the "-template-" name component, as in >>> > > > >> > "xwiki-enterprise-workspace-template-ui" to avoid confusion >>> with >>> > the >>> > > > >> > xwiki-platform artefact(s). >>> > > > >> > >>> > > > >> >>> > > > >> Since it will be a dependency of xwiki-enterprise-ui, does it >>> make >>> > > > sense to >>> > > > >> call it template? >>> > > > >> >>> > > > >> >>> > > > >> > >>> > > > >> > On Tue, Jul 30, 2013 at 4:01 PM, Guillaume "Louis-Marie" >>> > Delhumeau < >>> > > > >> > [email protected]> wrote: >>> > > > >> > >>> > > > >> > > For the Workspace integration in XE, I need to modify the >>> > default >>> > > > XARs. >>> > > > >> > It >>> > > > >> > > makes me able to provide template XARs for the creation of >>> > > subwikis, >>> > > > >> > which >>> > > > >> > > will be different from the XAR of the main wiki (for >>> example: we >>> > > > don't >>> > > > >> > need >>> > > > >> > > the WorkspaceManager UI in every subwikis). >>> > > > >> > > >>> > > > >> > > What I propose to do: >>> > > > >> > > >>> > > > >> > > 1/ Create a subproject *xwiki-enterprise-workspace-ui*, which >>> > > > defines >>> > > > >> > what >>> > > > >> > > a workspace should be. >>> > > > >> > > 1bis/ Create a *xwiki-enterprise-workspace-ui-all* too, in * >>> > > > >> > > xwiki-enterprise-distribution* >>> > > > >> > > >>> > > > >> > > 2/ Create a subproject *xwiki-enterprise-wiki-ui*, which >>> defines >>> > > > what a >>> > > > >> > > subwiki should be. >>> > > > >> > > 2bis/ Create a *xwiki-enterprise-wiki-ui-all* too, in * >>> > > > >> > > xwiki-enterprise-distribution* >>> > > > >> > > >>> > > > >> > > 3/ Add *xwiki-enterprise-wiki-ui* as a dependency of >>> > > > >> > *xwiki-enterprise-ui*. >>> > > > >> > > >>> > > > >> > >>> > > > >> > What do you want to achieve by doing this? >>> > > > >> > >>> > > > >> >>> > > > >> Currently we generate workspace-template.xar in xwiki-manager-ui >>> by >>> > > > copying >>> > > > >> the xwiki-enterprise-ui-all XAR. But I am integrating Workspaces >>> in >>> > XE >>> > > > so >>> > > > >> if we keep this construction, every workspace that use this >>> template >>> > > > will >>> > > > >> have the WorkspaceManager too! >>> > > > >> >>> > > > > >>> > > > >> So, I need to clearly separate what is the XE UI and what is a >>> > > template >>> > > > UI. >>> > > > >> >>> > > > > >>> > > > > I got that :) I was actually asking about point 3. Making the XAR >>> > xe-ui >>> > > > > depend on wiki-ui means what? To me it does not mean much, because >>> > you >>> > > > are >>> > > > > not going to install the wiki-ui XAR, using EM, as a transitive >>> > > > dependency >>> > > > > of xe-ui (where such a dependency declaration might be useful in a >>> > > way). >>> > > > > And even if you do that, all the contents of the wiki-ui XAR >>> would be >>> > > > > imported into the main wiki and that is not what you want by the >>> > > current >>> > > > > logic of Wiki/WorkspaceManager. >>> > > > > >>> > > > > So, unless I got it wrong, you might want to skip point 3. >>> > > > >>> > > > In Guillaume's proposal xwiki-enterprise-ui is going to be the XE >>> main >>> > > > wiki XAR which mean what you have in a generic subwiki (pretty much >>> > > > the old XE xar) plus what used to be in XEM. So among other things >>> > > > xwiki-enterprise-wiki-ui is going to be the default subwiki base UI >>> > > > extension from DW point of view (like it's XE right now in XEM). >>> > > > >>> > > > > >>> > > > > >>> > > > >> >>> > > > >> >>> > > > >> > >>> > > > >> > Thanks, >>> > > > >> > Eduard >>> > > > >> > >>> > > > >> > > >>> > > > >> > > This will be a temporary solution, because we will have >>> flavours >>> > > in >>> > > > the >>> > > > >> > > future. >>> > > > >> > > >>> > > > >> > > WDYT? >>> > > > >> > > >>> > > > >> > > Louis-Marie >>> > > > >> > > _______________________________________________ >>> > > > >> > > devs mailing list >>> > > > >> > > [email protected] >>> > > > >> > > http://lists.xwiki.org/mailman/listinfo/devs >>> > > > >> > > >>> > > > >> > _______________________________________________ >>> > > > >> > devs mailing list >>> > > > >> > [email protected] >>> > > > >> > http://lists.xwiki.org/mailman/listinfo/devs >>> > > > >> > >>> > > > >> >>> > > > >> Thanks, >>> > > > >> Louis-Marie >>> > > > >> _______________________________________________ >>> > > > >> devs mailing list >>> > > > >> [email protected] >>> > > > >> http://lists.xwiki.org/mailman/listinfo/devs >>> > > > >> >>> > > > > _______________________________________________ >>> > > > > devs mailing list >>> > > > > [email protected] >>> > > > > http://lists.xwiki.org/mailman/listinfo/devs >>> > > > >>> > > > >>> > > > >>> > > > -- >>> > > > Thomas Mortagne >>> > > > _______________________________________________ >>> > > > devs mailing list >>> > > > [email protected] >>> > > > http://lists.xwiki.org/mailman/listinfo/devs >>> > > > >>> > > _______________________________________________ >>> > > devs mailing list >>> > > [email protected] >>> > > http://lists.xwiki.org/mailman/listinfo/devs >>> > > >>> > _______________________________________________ >>> > devs mailing list >>> > [email protected] >>> > http://lists.xwiki.org/mailman/listinfo/devs >>> > >>> _______________________________________________ >>> devs mailing list >>> [email protected] >>> http://lists.xwiki.org/mailman/listinfo/devs >>> >> >> > _______________________________________________ > devs mailing list > [email protected] > http://lists.xwiki.org/mailman/listinfo/devs _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
