Hi Dirk, thanks for looking into it, seems that with latest commit, points 1 through 3 of the above issues' list get solved as well :-) Also, as a bonus, renaming the template to default addresses point 8, and people upgrading only have to modify their jspwiki[-custom].properties file if they want to revert to the 210 template. I've also had a look to o.a.w.ui.TemplateManager to better understand the fallback-to-default mechanism, and most probably will write it down on a "HowToWriteATemplate" page at jspwiki-wiki.a.o..
br, juan pablo On Sat, Dec 15, 2018 at 6:33 PM Dirk Frederickx <dirk.frederi...@gmail.com> wrote: > I just pushed some fixes related to the default (now haddock) template. > Please rerun your tests. > > > dirk > > On Tue, Dec 11, 2018 at 10:11 PM Dirk Frederickx < > dirk.frederi...@gmail.com> > wrote: > > > Hi Juan, > > > > I did some further testing. > > > > JSPWiki's template engine has an automatic mechanism to resolve the > > requested JSP's in 2 steps: > > - first the JSP is searched for in the current active template > > subdirectory : this is now HADDOCK > > - if that fails the JSP is searched for in the template/default > > directory (fall-back) > > This is for example used to resolve some of the AJAX JSPs. (so you > > do not need to replicate them - and maintain them - in the template > > directory) > > This is also a clever way for template builder only to change those > > JSPs you want to differentiate from the DEFAULT template. > > > > This behaviour is broken in the 2.11.Mx version, as the DEFAULT > template > > subdirectory has been renamed 210. > > > > Possible solution: > > Rename the HADDOCK template subdirectory to "default". > > + Copy the missing default JSPs so that the new default template > > subdirectory fully covers all needed JSPs. > > (localheader.jsp, 3 AJAX*.jsp files, ?more ) > > > > Note: we could still keep an empty "template/haddock" subdirectory; > which > > would automatically redirect to the default template. But IMO there is > > little use for this. > > Note: the name "haddock" will still be retained for the javascript > files; > > but not anymore in the template JSP. > > > > dirk > > > > > > > > > > > > > > > > > > > > > > On Tue, Dec 11, 2018 at 12:54 AM Juan Pablo Santos Rodríguez < > > juanpablo.san...@gmail.com> wrote: > > > >> Hi Dirk, > >> > >> meant to send an e-mail with it this afternoon, but forgot :-S > >> > >> That page is linked from the "Building from source" page, so hopefully > >> will > >> be easily discoverable. The mvn-cheatsheet.md file present on source > still > >> needs to be polished, though. > >> > >> As for the test itself, how is it failing? An unchecked exception, the > >> assertion (which is the returned value, as opposed to the expected > one)?.. > >> > >> > >> thx, > >> juan pablo > >> > >> El mar., 11 dic. 2018 0:44, Dirk Frederickx <dirk.frederi...@gmail.com> > >> escribió: > >> > >> > Juan, > >> > > >> > Thanks for putting your description on > >> > > >> > > >> > https://jspwiki-wiki.apache.org/Wiki.jsp?page=Common%20problems%20when%20building%20JSPWiki > >> > ; > >> > That made the build run. I was able to create a war. > >> > > >> > Still one test is failing (testReadContentsFromPipe) so I needed to > >> use > >> > the -DskipTests flag. > >> > > >> > > >> > dirk > >> > > >> > > >> > > >> > > >> > On Sat, Dec 8, 2018 at 2:15 PM Dirk Frederickx < > >> dirk.frederi...@gmail.com> > >> > wrote: > >> > > >> > > Juan > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > > >> > > *- Point 6, question: on which version was that tested? the issue > >> > > raisedpoints to 2.11.0.M2-SNAPSHOT (current master, not the RC tag), > >> but > >> > > that isalso building ([#2] does the whole build). On previous > >> versions, > >> > > themarkdown module was build after the main war, and with 2.11.0.M1 > it > >> > > buildsbefore, and then it's included on the main war, but that > >> shouldn't > >> > > matter.The error refers to not being able to find the tests classes > >> from > >> > > the mainjar which is weird, as they should've been generated on the > >> test > >> > > phase ofthat module.. Dirk, would you mind checking if > >> > > ajspwiki-2.11.0.M2-SNAPSHOT-tests.jar file is found on > >> > > thejspwiki-main/target folder?* > >> > > > >> > > That JAR is missing in the target folder. Only > >> > > "jspwiki-2.11.0.M2-SNAPSHOT.jar" is there. > >> > > Notice that I ran "mvn install -Dmaven.test.skip " ; so no tests > were > >> > > run. > >> > > > >> > > Notice that when I run "mvn install" (with all tests) is still > fails > >> (as > >> > > it used to do before) > >> > > From some reason the test FileUtils.java/testReadContentsFromPipe() > is > >> > > always failing for me. > >> > > Havent been able to figure out why this is. > >> > > > >> > > > >> > > > >> > > dirk > >> > > > >> > > > >> > > > >> > > On Fri, Dec 7, 2018 at 12:03 AM Juan Pablo Santos Rodríguez < > >> > > juanpablo.san...@gmail.com> wrote: > >> > > > >> > >> Hi, > >> > >> > >> > >> this is a summary of the issues that have been noted on the > 2.11.0.M1 > >> > >> vote: > >> > >> > >> > >> Issues > >> > >> ******** > >> > >> 1.- search does not work, page giving "No template file called > >> > >> 'AJAXSearch.jsp'" > >> > >> 2.- live preview does not work, access_log giving 404 on "POST > >> > >> /wiki/templates/default/AJAXPreview.jsp" > >> > >> 3.- after uploading an attachment, at the top of the page gives "No > >> > >> template file called 'localheader.jsp'" > >> > >> 4.- after Saving or Canceling a page edit, distorted pages again > (as > >> if > >> > it > >> > >> cannot load the CSS files, but no 404's for it) > >> > >> 4.1.- ClassCastExceptions are shown at > >> > >> o.a.w.preference.Prefereces#parseJSONPreferences (line 145) > >> > >> 5.- Readme.md with outdated build instuctions > >> > >> 5.1.- document that mvn compile or mvn test alone won't make the > >> whole > >> > >> build (specifically, the portable build will fail, it needs at > least > >> mvn > >> > >> package) > >> > >> 6.- mvn clean install failing on markdown module > >> > >> 7.- build failure on portable module: Failed to execute goal > >> > >> org.apache.maven.plugins:maven-dependency-plugin:3.1.1:unpack > >> > >> (unpack-wikipages-personal) on project jspwiki-portable > >> > >> 8.- o.a.w.InternalWikiException: Illegal arguments to findJSP(); > >> please > >> > >> check logs. at > >> > o.a.w.ui.TemplateManager.findJSP(TemplateManager.java:311) > >> > >> with 'default' template > >> > >> 9.- ClassCastException: java.lang.Boolean cannot be cast to > >> > >> java.lang.String when using haddock template (same exception as 4.1 > >> > above) > >> > >> > >> > >> First analysis and questions > >> > >> ********************************* > >> > >> - Points 1 to 3 don't know why are they caused, need more time to > >> look > >> > at > >> > >> them > >> > >> - Points 4 and 9 seem easy to fix as the bug is most likely to be > >> > >> introduced by [#1] > >> > >> - Point 5 should be easy to fix too > >> > >> - Point 6, question: on which version was that tested? the issue > >> raised > >> > >> points to 2.11.0.M2-SNAPSHOT (current master, not the RC tag), but > >> that > >> > is > >> > >> also building ([#2] does the whole build). On previous versions, > the > >> > >> markdown module was build after the main war, and with 2.11.0.M1 it > >> > builds > >> > >> before, and then it's included on the main war, but that shouldn't > >> > matter. > >> > >> The error refers to not being able to find the tests classes from > the > >> > main > >> > >> jar which is weird, as they should've been generated on the test > >> phase > >> > of > >> > >> that module.. Dirk, would you mind checking if a > >> > >> jspwiki-2.11.0.M2-SNAPSHOT-tests.jar file is found on the > >> > >> jspwiki-main/target folder? > >> > >> - Point 7, another question, how was the build made (cfr. point > 5.1)? > >> > >> - Point 8, one last question, was the jspwiki.template property set > >> to > >> > >> "default"? If so, that error should be expected, default (2.10) > >> template > >> > >> was renamed to "210" on 2.11.0.M1 because it is not the default > >> template > >> > >> anymore, so the name is misleading... > >> > >> > >> > >> Next steps > >> > >> ************* > >> > >> First thing is to fix the build obviously. If nobody does beat me > to > >> it, > >> > >> on > >> > >> the following days I'll revert the pom.xml and o.a.w.Release > >> versions so > >> > >> they point to 2.11.0.M1(-SNAPSHOT) again. > >> > >> > >> > >> Once that is done, when should the 2.11.0.M1-rc2 vote be cast? At > >> work, > >> > if > >> > >> someone misses the release train date, it has to wait until next > >> > >> "stop"/release date, and given the amount of issues noted, I'm more > >> > >> inclined to wait until February. We don't need to rush, and there > >> would > >> > be > >> > >> plenty of time to prepare the rc2. Also I'd like to focus on > bringing > >> > the > >> > >> integration tests back alive, and make them useful and easier to > >> > mantain. > >> > >> I've been working with Selenide [#3] for the last year and I think > it > >> > >> would > >> > >> be a great replacement for the current Selenium tests (which by the > >> way > >> > >> are > >> > >> thought for the 210 template). > >> > >> > >> > >> thoughts? Have I missed anything? > >> > >> > >> > >> > >> > >> thanks, > >> > >> juan pablo > >> > >> > >> > >> [#1]: > >> > >> > >> > >> > >> > > >> > https://github.com/apache/jspwiki/commit/87bf9b941fdff55fe4e80a031269d19bc39363a7#diff-71de8c033afbea8be078f02ec7f141a9R145 > >> > >> [#2 > >> > >> < > >> > > >> > https://github.com/apache/jspwiki/commit/87bf9b941fdff55fe4e80a031269d19bc39363a7#diff-71de8c033afbea8be078f02ec7f141a9R145[%232 > >> > >]: > >> > >> https://builds.apache.org/job/JSPWiki > >> > >> [#3]: https://selenide.org/quick-start.html > >> > >> > >> > > > >> > > >> > > >
