[xwiki-devs] [Proposal] Plan to remove XWiki Enterprise

List overview All Threads
Download

newer

older

[xwiki-devs] [Brainstorming] About...

Re: [xwiki-devs] devs Digest, Vol...

vincent＠massol.net

3 Mar 2015 3 Mar '15

10:23 a.m.

Hi devs, I’d like to work on the following (and any help will be most welcome). What ==== 1 - Finish moving XE pages into xwiki-platform 2 - Introduce flavor concept in xwiki-platform: xwiki-platform/xwiki-platform-core/xwiki-platform-flavors/ |_ xwiki-platform-flavor-minimal/ |_ xwiki-platform-flavor-xwiki/ |_ xwiki-platform-flavor-xwiki-main/ |_ xwiki-platform-flavor-xwiki-wiki/ |_ xwiki-platform-flavor-test/ where: * minimal: the base for the “xwiki” and “test” flavors. Contains the core deps that need to be present in any xwiki runtime * xwiki: the only runtime flavor that we distribute as part of the xwiki github organization. A generic flavor with no vertical. See http://markmail.org/message/keo7cs6u3fuf676w * test: minimal + the export feature (since when writing functional tests there's is often the need to export pages as XAR) 3 - Modify the XWiki Packager Plugin: * Do not include any dep by default, instead only rely on the plugin user’s declared deps. Users of the plugin will use flavors as deps. * Split the current PackageMojo into 2 mojos: ** WarMojo: generates a WAR file (WAR distribution) ** StandalonePackageMojo: generates a standalone ZIP (Jetty+HSQLDB) 4 - Refactor functional tests in xwiki-platform to use the new StandalonePackageMojo with deps on xwiki-platform-flavor-test 5 - Introduce Distribution modules in xwiki-platform: xwiki-platform/xwiki-platform-distributions/ |_ xwiki-platform-distribution-war/ |_ xwiki-platform-distribution-standalone/ |_ xwiki-platform-distribution-installers/ |_ xwiki-platform-distribution-images/ |_ xwiki-platform-distribution-image-mysql/ |_ (more later) |_ xwiki-platform-distribution-archetype/ |_ xwiki-platform-distribution-xar/ where: * xwiki-platform-distribution-war and xwiki-platform-distribution-standalone will use the XWiki Packager Plugin’s mojos and will have a dep on xwiki-platform-flavor-xwiki in their POM * xwiki-platform-distribution-images provides Docker images (that we’ll publish to the Docker Hub: https://hub.docker.com/) * xwiki-platform-distribution-archetype is the move of xwiki-enterprise-archetype/. Its goal is to create the build for new products based on XWiki. It’s to help OEMs. * xwiki-platform-distribution-xar contains the full XARs (for the main wiki and subwikis) for those who don’t or cannot use the DW/EM and want to import them manually. 6 - Move functional tests from xwiki-enterprise to xwiki-platform. * Ideally move specific tests to the module they’re testing * Move the rest to xwiki-platform/xwiki-platform-distributions/xwiki-platform-distribution-tests/ 7 - Remove xwiki-enterprise and start advertising the new distribution (update of xwiki.org) When ===== My goal would be to achieve this in the XWiki 7.x cycle (i.e. before the end of the year). Misc ==== Previous thread on related topic: * http://markmail.org/message/n2yove6lr3rlzh6j WDYT? Thanks -Vincent

Show replies by date

Thomas Mortagne

3 Mar 3 Mar

10:38 a.m.

Sounds good. I would take this opportunity to not migrate what's in xwiki-enterprise-installers/xwiki-enterprise-installer-generic and xwiki-enterprise-installers/xwiki-enterprise-installer-window but that's another discussion. On Tue, Mar 3, 2015 at 10:23 AM, vincent(a)massol.net <vincent(a)massol.net> wrote:

...

-- Thomas Mortagne

Eduard Moraru

7 Mar 7 Mar

2:23 a.m.

Hi, On Tue, Mar 3, 2015 at 11:38 AM, Thomas Mortagne <thomas.mortagne(a)xwiki.com> wrote:

...

core deps that need to be present in any xwiki runtime

* xwiki: the only runtime flavor that we distribute as part of the xwiki

github organization. A generic flavor with no vertical. See http://markmail.org/message/keo7cs6u3fuf676w

* test: minimal + the export feature (since when writing functional

tests there's is often the need to export pages as XAR)

Wouldn't basic import/export be part of the "minimal" flavor? Not sure I understand the difference between minimal and test.

...

3 - Modify the XWiki Packager Plugin: * Do not include any dep by default, instead only rely on the plugin

user’s declared deps. Users of the plugin will use flavors as deps.

* Split the current PackageMojo into 2 mojos: ** WarMojo: generates a WAR file (WAR distribution) ** StandalonePackageMojo: generates a standalone ZIP (Jetty+HSQLDB) 4 - Refactor functional tests in xwiki-platform to use the new

StandalonePackageMojo with deps on xwiki-platform-flavor-test

5 - Introduce Distribution modules in xwiki-platform: xwiki-platform/xwiki-platform-distributions/ |_ xwiki-platform-distribution-war/ |_ xwiki-platform-distribution-standalone/ |_ xwiki-platform-distribution-installers/ |_ xwiki-platform-distribution-images/ |_ xwiki-platform-distribution-image-mysql/ |_ (more later) |_ xwiki-platform-distribution-archetype/ |_ xwiki-platform-distribution-xar/ where: * xwiki-platform-distribution-war and

xwiki-platform-distribution-standalone will use the XWiki Packager Plugin’s mojos and will have a dep on xwiki-platform-flavor-xwiki in their POM

* xwiki-platform-distribution-images provides Docker images (that we’ll

publish to the Docker Hub: https://hub.docker.com/)

* xwiki-platform-distribution-archetype is the move of

xwiki-enterprise-archetype/. Its goal is to create the build for new products based on XWiki. It’s to help OEMs.

* xwiki-platform-distribution-xar contains the full XARs (for the main

wiki and subwikis) for those who don’t or cannot use the DW/EM and want to import them manually.

6 - Move functional tests from xwiki-enterprise to xwiki-platform. * Ideally move specific tests to the module they’re testing * Move the rest to

xwiki-platform/xwiki-platform-distributions/xwiki-platform-distribution-tests/

7 - Remove xwiki-enterprise and start advertising the new distribution

(update of xwiki.org)

When ===== My goal would be to achieve this in the XWiki 7.x cycle (i.e. before the

end of the year).

Misc ==== Previous thread on related topic: * http://markmail.org/message/n2yove6lr3rlzh6j WDYT?

Sounds good on my end. Thanks, Eduard

...

Thanks -Vincent _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

-- Thomas Mortagne _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

vincent＠massol.net

10:21 a.m.

On 7 Mar 2015 at 02:23:35, Eduard Moraru (enygma2002@gmail.com(mailto:enygma2002@gmail.com)) wrote:

...

Hi, On Tue, Mar 3, 2015 at 11:38 AM, Thomas Mortagne wrote:

core deps that need to be present in any xwiki runtime

* xwiki: the only runtime flavor that we distribute as part of the xwiki

github organization. A generic flavor with no vertical. See http://markmail.org/message/keo7cs6u3fuf676w

* test: minimal + the export feature (since when writing functional

tests there's is often the need to export pages as XAR)

Wouldn't basic import/export be part of the "minimal" flavor? Not sure I understand the difference between minimal and test.

The minimal flavor is theoretically supposed to be an empty flavor, it contains the bare minimum for XWiki to start. Right now this means a lot of modules (those that are defined in the Packager plugin). In the future, as we divide modules into smaller feature set, we should be able to reduce the size of the minimal flavor. Just to give one example, the WYSIWYG editor shouldn’t be something that you have in the minimal flavor; it shouldn’t be required to start XWiki and it should be possible to install the WYSIWYG editor if you want. The test flavor shouldn’t exist: the functional tests for each module should have a dep on the minimal flavor + all the deps for what they are testing. In the past, I added the export dep in the Packager plugin because the way I work when I develop a module is like this: * Code the API up to a point * Create the functional test infrastructure and create a basic functional test * Run it to generate a runtime XWiki instance (in target/xwiki) * Create the UI in that XWiki instance and export the pages to src/main/resources * Iterate: Add more test lines at the same time as I add the wiki pages So for this way of working, I needed to be able to export wiki page easily and I was fed up to have to import the export feature all the time so I put it in the Packager plugin. So we can decide if we want to continue this or if there’s a better flow. When I defined the test flavor above, I was thinking about minimal + export module. Hope it’s more clear :) Thanks -Vincent

...

3 - Modify the XWiki Packager Plugin: * Do not include any dep by default, instead only rely on the plugin

user’s declared deps. Users of the plugin will use flavors as deps.

StandalonePackageMojo with deps on xwiki-platform-flavor-test

xwiki-platform-distribution-standalone will use the XWiki Packager Plugin’s mojos and will have a dep on xwiki-platform-flavor-xwiki in their POM

* xwiki-platform-distribution-images provides Docker images (that we’ll

publish to the Docker Hub: https://hub.docker.com/)

* xwiki-platform-distribution-archetype is the move of

xwiki-enterprise-archetype/. Its goal is to create the build for new products based on XWiki. It’s to help OEMs.

* xwiki-platform-distribution-xar contains the full XARs (for the main

wiki and subwikis) for those who don’t or cannot use the DW/EM and want to import them manually.

6 - Move functional tests from xwiki-enterprise to xwiki-platform. * Ideally move specific tests to the module they’re testing * Move the rest to

xwiki-platform/xwiki-platform-distributions/xwiki-platform-distribution-tests/

7 - Remove xwiki-enterprise and start advertising the new distribution

(update of xwiki.org)

When ===== My goal would be to achieve this in the XWiki 7.x cycle (i.e. before the

end of the year).

Misc ==== Previous thread on related topic: * http://markmail.org/message/n2yove6lr3rlzh6j WDYT?

Sounds good on my end. Thanks, Eduard

Thanks -Vincent _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

-- Thomas Mortagne _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

_______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

Ecaterina Moraru (Valica)

9 Mar 9 Mar

1:56 p.m.

Just some mentions about these removes/moves: - We moved before things from XE to Platform. It's a pain if you want to 'blame' the source and in the JIRA issue we don't have a link from where the page was moved from. Tracking the history for a moved page is difficult and a comment stating where the location was is useful. - What will happen with the history if we remove the XE repository? Although the history + the blame use case might not be interesting for everyone, myself I'm using it often to understand the initial purpose of the feature, to determine if it's a regression, to know which person to contact, etc. Do we have a strategy for keeping the history somehow? Thanks, Caty On Sat, Mar 7, 2015 at 11:21 AM, vincent(a)massol.net <vincent(a)massol.net> wrote:

...

On 7 Mar 2015 at 02:23:35, Eduard Moraru (enygma2002(a)gmail.com(mailto: enygma2002(a)gmail.com)) wrote:

Hi, On Tue, Mar 3, 2015 at 11:38 AM, Thomas Mortagne wrote: > Sounds good. I would take this opportunity to not migrate what's in > xwiki-enterprise-installers/xwiki-enterprise-installer-generic and > xwiki-enterprise-installers/xwiki-enterprise-installer-window but > that's another discussion. > > On Tue, Mar 3, 2015 at 10:23 AM, vincent(a)massol.net > wrote: > > Hi devs, > > > > I’d like to work on the following (and any help will be most

welcome).

> > > > What > > ==== > > > > 1 - Finish moving XE pages into xwiki-platform > > 2 - Introduce flavor concept in xwiki-platform: > > > > xwiki-platform/xwiki-platform-core/xwiki-platform-flavors/ > > |_ xwiki-platform-flavor-minimal/ > > |_ xwiki-platform-flavor-xwiki/ > > |_ xwiki-platform-flavor-xwiki-main/ > > |_ xwiki-platform-flavor-xwiki-wiki/ > > |_ xwiki-platform-flavor-test/ > > > > where: > > * minimal: the base for the “xwiki” and “test” flavors. Contains the > core deps that need to be present in any xwiki runtime > > * xwiki: the only runtime flavor that we distribute as part of the

xwiki

github organization. A generic flavor with no vertical. See http://markmail.org/message/keo7cs6u3fuf676w

* test: minimal + the export feature (since when writing functional

tests there's is often the need to export pages as XAR)

Wouldn't basic import/export be part of the "minimal" flavor? Not sure I understand the difference between minimal and test.

> > 3 - Modify the XWiki Packager Plugin: > > > > * Do not include any dep by default, instead only rely on the plugin > user’s declared deps. Users of the plugin will use flavors as deps. > > * Split the current PackageMojo into 2 mojos: > > ** WarMojo: generates a WAR file (WAR distribution) > > ** StandalonePackageMojo: generates a standalone ZIP (Jetty+HSQLDB) > > > > 4 - Refactor functional tests in xwiki-platform to use the new > StandalonePackageMojo with deps on xwiki-platform-flavor-test > > > > 5 - Introduce Distribution modules in xwiki-platform: > > > > xwiki-platform/xwiki-platform-distributions/ > > |_ xwiki-platform-distribution-war/ > > |_ xwiki-platform-distribution-standalone/ > > |_ xwiki-platform-distribution-installers/ > > |_ xwiki-platform-distribution-images/ > > |_ xwiki-platform-distribution-image-mysql/ > > |_ (more later) > > |_ xwiki-platform-distribution-archetype/ > > |_ xwiki-platform-distribution-xar/ > > > > where: > > > > * xwiki-platform-distribution-war and > xwiki-platform-distribution-standalone will use the XWiki Packager

Plugin’s

> mojos and will have a dep on xwiki-platform-flavor-xwiki in their POM > > * xwiki-platform-distribution-images provides Docker images (that

we’ll

> publish to the Docker Hub: https://hub.docker.com/) > > * xwiki-platform-distribution-archetype is the move of > xwiki-enterprise-archetype/. Its goal is to create the build for new > products based on XWiki. It’s to help OEMs. > > * xwiki-platform-distribution-xar contains the full XARs (for the

main

> wiki and subwikis) for those who don’t or cannot use the DW/EM and

want to

> import them manually. > > > > 6 - Move functional tests from xwiki-enterprise to xwiki-platform. > > > > * Ideally move specific tests to the module they’re testing > > * Move the rest to >

xwiki-platform/xwiki-platform-distributions/xwiki-platform-distribution-tests/

> > > > 7 - Remove xwiki-enterprise and start advertising the new

distribution

> (update of xwiki.org) > > > > When > > ===== > > > > My goal would be to achieve this in the XWiki 7.x cycle (i.e. before

the

end of the year).

Misc ==== Previous thread on related topic: * http://markmail.org/message/n2yove6lr3rlzh6j WDYT?

Sounds good on my end. Thanks, Eduard

Thanks -Vincent _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

-- Thomas Mortagne _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

_______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

Sergiu Dumitriu

3:57 p.m.

That is doable, in two ways: 1. Merge xwiki-enterprise into xwiki-platform, move the modules we want to keep in their new location, delete the modules we don't need anymore. This requires planning where every module goes in advance, and fixes everything at once. 2. Extract each module that we want to keep in a separate git repository, using https://gist.github.com/sdumitriu/1993357 (I need to update this with a better version), and merge it into xwiki-platform. This lets us handle each module at a time, but extracting a module takes a while. On 03/09/2015 08:56 AM, Ecaterina Moraru (Valica) wrote:

...

-- Sergiu Dumitriu http://purl.org/net/sergiu

Thomas Mortagne

4:18 p.m.

I usually use https://github.com/git/git/tree/master/contrib/subtree for this kind of things, it's starting to be a bit old but it work well. For example I used it when moving deprecated platform modules to their own repository on contrib like https://github.com/xwiki-contrib/xwiki-platform-wiki-manager. On Mon, Mar 9, 2015 at 3:57 PM, Sergiu Dumitriu <sergiu(a)xwiki.com> wrote:

...

-- Sergiu Dumitriu http://purl.org/net/sergiu _______________________________________________ devs mailing list devs(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/devs

-- Thomas Mortagne

3576

days inactive

3582

days old

xwiki-devs@xwiki.org

Manage subscription

6 comments

5 participants

tags (0)

participants (5)

Ecaterina Moraru (Valica)
Eduard Moraru
Sergiu Dumitriu
Thomas Mortagne
vincent＠massol.net