New subject: [xwiki-dev] Re: [xwiki-commits] r2339 - xwiki/trunk/core/src/main/java/com/xpn/xwiki/web

8 Mar 2007

Sebastien,

Don't forget to merge your changes (rev 2338 and 2339) in the  
XWIKI_1_0 branch or they won't appear in 1.0 Beta 6 release (the  
trunk is for 1.1).

Thanks
-Vincent

On Mar 8, 2007, at 1:09 PM, S??bastien Ga??de wrote:

...
  Author: sgaide
 Date: 2007-03-08 13:09:11 +0100 (Thu, 08 Mar 2007)
 New Revision: 2339

 Modified:
    xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/XWikiAction.java
    xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/XWikiPortlet.java
 Log:
 XWIKI-949
 Corrected page access exception handling

 Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiAction.java
 ===================================================================
 --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiAction.java	2007-03-08 11:26:05 UTC (rev 2338)
 +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiAction.java	2007-03-08 12:09:11 UTC (rev 2339)
 @@ -172,13 +172,11 @@
                          Utils.parseTemplate("accessdenied", context);
                          return null;
                      } else if (xex.getCode() ==  
 XWikiException.ERROR_XWIKI_USER_INACTIVE) {
 -                        String page = Utils.getPage(request,  
 "userinactive");
 -                        Utils.parseTemplate(page, context);
 +                        Utils.parseTemplate("userinactive", context);
                          return null;
                      }else if(xex.getCode() ==  
 XWikiException.ERROR_XWIKI_APP_ATTACHMENT_NOT_FOUND){
 -                        String page = Utils.getPage(request,  
 "exception");
                          context.put 
 ("message","attachmentdoesnotexist");
 -                        Utils.parseTemplate(page, context);
 +                        Utils.parseTemplate("exception", context);
                          return null;
                      }
                      vcontext.put("exp", e);

 Modified: xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiPortlet.java
 ===================================================================
 --- xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiPortlet.java	2007-03-08 11:26:05 UTC (rev 2338)
 +++ xwiki/trunk/core/src/main/java/com/xpn/xwiki/web/ 
 XWikiPortlet.java	2007-03-08 12:09:11 UTC (rev 2339)
 @@ -120,12 +120,10 @@
          try {
              XWikiException xex = (XWikiException) e;
              if (xex.getCode() ==  
 XWikiException.ERROR_XWIKI_ACCESS_DENIED) {
 -                String page = Utils.getPage(request, "accessdenied");
 -                Utils.parseTemplate(page, context);
 +                Utils.parseTemplate("accessdenied", context);
                  return;
              } else if (xex.getCode() ==  
 XWikiException.ERROR_XWIKI_USER_INACTIVE) {
 -                String page = Utils.getPage(request, "userinactive");
 -                Utils.parseTemplate(page, context);
 +                Utils.parseTemplate("userinactive", context);
                  return;
              }
              Utils.parseTemplate(Utils.getPage(request,  
 "exception"), context);

 --
 You receive this message as a subscriber of the xwiki- 
 commits(a)objectweb.org mailing list.
 To unsubscribe: mailto:xwiki-commits-unsubscribe@objectweb.org
 For general help: mailto:sympa@objectweb.org?subject=help
 ObjectWeb mailing lists service home page: http://www.objectweb.org/ 
 wws 