[xwiki-devs] [Proposal] xwiki-web-standard reorganization cleanup

Hi, I'm about to commit silk icons so that we bundle them with our webapp. I want to commit them under xwiki-web-standard but we don't have any standard place where to put this kind of common resources. We currently have common resources (js and icons) under the root of our webapp (yui,xwiki.js,etc) and in the albatross skin (most of them). Those resources are independant from a particular skin and thus shouldn't be placed in one of them (at least imho). I suggest that we move javascript and icon files out of albatross and that we introduce a new rule: don't put javascript in our skins. Note that I'm not suggesting to deprecate our baseskin mechanism since being able to use inheritance between skins is a good thing (it allows to customize only part of the styles). Proposal 1 ======== Tree: xwiki/ -- resources/ ---- icons/ ------ tango/ ------ silk/ ---- javascript/ ------ lib/ (we could minimize files in this folder at build time with rhino) -------- prototype/ -------- scriptaculous/ -------- yui/ ------ xwiki/ (files get from this directory would be parsed since almost xwiki js files contains velocity calls) -- skins/ ---- toucan/ -- templates/ -- META-INF/ -- WEB-INF/ Getter methods: Util.getJavascriptResource(String filename) Util.getIconResource(String filename) The resources directory would be held by xwiki-web-standard. Note that this way of getting resources would prevent overloading of icons and javascript from the skin (unlike xwiki.getSkinFile). Proposal 2 ======== Tree: xwiki/ -- skins/ ---- commons/ ------ icons/ -------- tango/ -------- silk/ ------ javascript/ -------- lib/ (we could minimize files in this folder at build time with rhino) ---------- prototype/ ---------- scriptaculous/ ---------- tinymce/ ---------- yui/ -------- xwiki/ (files get from this directory would be parsed since almost xwiki js files contains velocity calls) ---- toucan/ -- templates/ -- META-INF/ -- WEB-INF/ Getter methods: Modify getSkinFile to look into commons after looking into skin and baseskin (toucan then albatross in our distrib). The skins/commons/ directory would be held by xwiki-web-standard. I'd also like to take advantage of this refactoring to remove some files from the root of our webapp if we all agree: - JSTrim* - freemind (unused) - s5 (moved out of XE 2 years ago IIRW) WDYT ? Thanks, JV.