[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui ...

[Christian Bauer]

  User: cbauer  
  Date: 08/01/02 13:59:49

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui 
                        FeedServlet.java
  Log:
  Make feed domain model extensible, preparation for aggregator
  
  Revision  Changes    Path
  1.14      +3 -3      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FeedServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FeedServlet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- FeedServlet.java	30 Dec 2007 02:33:26 -0000	1.13
  +++ FeedServlet.java	2 Jan 2008 18:59:49 -0000	1.14
  @@ -95,10 +95,10 @@
   
               // Authenticate and authorize, first with current user (session) then with basic HTTP authentication
               Integer currentAccessLevel = (Integer)Component.getInstance("currentAccessLevel");
  -            if (feed.getDirectory().getReadAccessLevel() > currentAccessLevel) {
  +            if (feed.getReadAccessLevel() > currentAccessLevel) {
                   boolean loggedIn = ((Authenticator)Component.getInstance("authenticator")).authenticateBasicHttp(request);
                   currentAccessLevel = (Integer)Component.getInstance("currentAccessLevel");
  -                if (!loggedIn || feed.getDirectory().getReadAccessLevel() > currentAccessLevel) {
  +                if (!loggedIn || feed.getReadAccessLevel() > currentAccessLevel) {
                       response.setHeader("WWW-Authenticate", "Basic realm=\"" + feed.getTitle().replace("\"", "'") + "\"");
                       response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
                       if (startedTx) userTx.commit();
  @@ -145,7 +145,7 @@
                   syndFeed.getTitle() + " (" + Messages.instance().get("lacewiki.label.tagDisplay.Tag") + " '" + tag + "')"
               );
           }
  -        syndFeed.setLink(WikiUtil.renderURL(feed.getDirectory()));
  +        syndFeed.setLink(feed.getLink());
           syndFeed.setAuthor(feed.getAuthor());
           if (feed.getDescription() != null && feed.getDescription().length() >0)
               syndFeed.setDescription(feed.getDescription());