[M2] store-specific duplicate resources

Hi. I found some duplicate resources. I don't understand, why it are needed. Please explain why it are needed. 1. hibernate mappings where: xwiki-platform-core/src/main/resources xwiki-platform-web/standard/src/main/webapp/WEB-INF/classes what: xwiki*.hbm.xml feeds*.hbm.xml seems that xwiki-platform-web/standard override xwiki-platform-core. I think core hibernate mappings should be in xwiki-platform-core only. 2. hibernate.cfg.hbm.xml xwiki-product-enterprise/distribution/src/main/resources/hibernate.cfg.hsql.xml = filtered xwiki-platform-web/standard/src/main/resources/hibernate.cfg.xml Because of xwiki-product-enterprise/distribution/src/main/resources/xwiki.cfg (xwiki.store.hibernate.path=/WEB-INF/hibernate.cfg.hsql.xml) xwiki standalone distribution still builds only for hsqldb. (XWIKI-1417) So, if I correct (all duplicates is not needed), I propose: 1. remove xwiki-platform-web/standard/src/main/webapp/WEB-INF/classes/*.hbm.xml 2. remove hibernate.cfg.hsql.xml and xwiki.cfg (or remove hsql from xwiki.cfg) from xwiki-product-enterprise/distribution/src/main/resources/ 3. remove or modify 2nd <fileSet> in xwiki-product-enterprise/distribution/src/assemble/application.xml (For now it is also coping jetty distribution in webapp/xwiki/WEB-INF/jetty, so xwiki distribution contains 2 jetty's) Tell me where I am wrong. I performed this proposal on my svn trank workcopy, and everything is fine. Functional tests pass on all databases. -- Artem Melentyev, UralSU