+1 on integrating it in the trunk before the release. regards, Harry
On 10 April 2014 00:45, Siegfried Goeschl <siegfried.goes...@it20one.com>wrote: > Hi folks, > > can we move my GitHub stuff back to the SVN trunk - either before or after > the release? > > The stuff is mostly finished but having it out-of-sync with SVN is a bit > dangerous - I will sync GitHub with the latest SVN commits to make the > merge easier > > Cheers, > > Siegfried Goeschl > > On 07 Apr 2014, at 15:02, Juan Pablo Santos Rodríguez < > juanpablo.san...@gmail.com> wrote: > > > Hi! > > > > As noted by several comments at JSPWIKI-817, a 2.10.1 release is needed. > > > > Current trunk not only solves this issue, but also JSPWIKI-831 (Container > > authentication broken), which make a very good couple of reasons to make > > the release. I'd like to also include JSPWIKI-832 and JSPWIKI-822, which > > are two low-hanging fruits, and also JSPWIKI-814 (got it on local, > attached > > unit tests look good, but I'd like to do some more testing). > > > > If anyone doesn't do it before, I think I'll be able to have them in > trunk > > in 5 to 10 days, so my question is, sounds reasonable if we wait these > days > > to get these issues fixed before 2.10.1? > > > > > > br, > > juan pablo > > > > > > On Mon, Apr 7, 2014 at 10:51 PM, Juan Pablo Santos Rodríguez (JIRA) < > > j...@apache.org> wrote: > > > >> > >> [ > >> > https://issues.apache.org/jira/browse/JSPWIKI-817?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13962238#comment-13962238 > ] > >> > >> Juan Pablo Santos Rodríguez commented on JSPWIKI-817: > >> ----------------------------------------------------- > >> > >> Hi! > >> > >> es_ES translation was also updated at r1569989. As for the release, it > >> seems it'll be very welcome, let's follow this up at dev@j.a.o > >> > >> > >> br, > >> juan pablo > >> > >>> Install.jsp is broken, and should be more foolproof and provide better > >> guidance > >>> > >> > ------------------------------------------------------------------------------- > >>> > >>> Key: JSPWIKI-817 > >>> URL: https://issues.apache.org/jira/browse/JSPWIKI-817 > >>> Project: JSPWiki > >>> Issue Type: Bug > >>> Components: Core & storage > >>> Affects Versions: 2.10 > >>> Environment: Ubuntu Linux > >>> Java 7 > >>> Tomcat 7 > >>> JSPWiki 2.10.0 > >>> Reporter: Harry Metske > >>> Assignee: Harry Metske > >>> Fix For: 2.10.1 > >>> > >>> > >>> Firing up the JSPWiki/Install.jsp gives the following NPE: > >>> {noformat} > >>> Feb 02, 2014 1:59:04 PM org.apache.catalina.core.StandardWrapperValve > >> invoke > >>> SEVERE: Servlet.service() for servlet [jsp] in context with path > [/wiki] > >> threw exception [An exception occurred processing JSP page /Install.jsp > at > >> line 46 > >>> 43: WikiSession wikiSession = wikiContext.getWikiSession(); > >>> 44: > >>> 45: // Parse the existing properties > >>> 46: installer.parseProperties(); > >>> 47: boolean validated = false; > >>> 48: String password = null; > >>> 49: ResourceBundle rb = Preferences.getBundle( wikiContext, > >> "CoreResources" ); > >>> Stacktrace:] with root cause > >>> java.lang.NullPointerException > >>> at > >> > org.apache.wiki.util.CommentedProperties.writeProperty(CommentedProperties.java:213) > >>> at > >> > org.apache.wiki.util.CommentedProperties.put(CommentedProperties.java:116) > >>> at org.apache.wiki.ui.Installer.parseProperty(Installer.java:320) > >>> at > org.apache.wiki.ui.Installer.parseProperties(Installer.java:223) > >>> at org.apache.jsp.Install_jsp._jspService(Install_jsp.java:122) > >>> at > >> org.apache.jasper.runtime.HttpJspBase.service(HttpJspBase.java:70) > >>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:728) > >>> at > >> > org.apache.jasper.servlet.JspServletWrapper.service(JspServletWrapper.java:432) > >>> at > >> org.apache.jasper.servlet.JspServlet.serviceJspFile(JspServlet.java:390) > >>> at > >> org.apache.jasper.servlet.JspServlet.service(JspServlet.java:334) > >>> at javax.servlet.http.HttpServlet.service(HttpServlet.java:728) > >>> at > >> > org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:305) > >>> at > >> > org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) > >>> at > >> > org.apache.wiki.ui.WikiServletFilter.doFilter(WikiServletFilter.java:177) > >>> at > >> org.apache.wiki.ui.WikiJSPFilter.doFilter(WikiJSPFilter.java:121) > >>> at > >> > org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:243) > >>> at > >> > org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) > >>> at > >> > org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:222) > >>> at > >> > org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:123) > >>> at > >> > org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:472) > >>> at > >> > org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:171) > >>> at > >> > org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:99) > >>> at > >> > org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:947) > >>> at > >> > org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118) > >>> at > >> > org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:408) > >>> at > >> > org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1009) > >>> at > >> > org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:589) > >>> at > >> > org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:310) > >>> at > >> > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) > >>> at > >> > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) > >>> at java.lang.Thread.run(Thread.java:724) > >>> {noformat} > >>> This issue was introduced in 2.10.0-svn-36 (introduction of > >> jspwiki-custom.properties file) > >>> This was not reflected in Install.jsp. > >>> The jspwiki.properties file was moved into > >> WEB-INF/lib/jspwiki-war-<version>.jar . > >>> We should update the Installer: > >>> * to read from this default jspwiki.properties file > >>> * change the instructions > >>> * save the new properties to something like > >> /tmp/jspwiki-custom.properties > >>> * instruct to copy this file to a location that is classpath-readable > >> > >> > >> > >> -- > >> This message was sent by Atlassian JIRA > >> (v6.2#6252) > >> > >
