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

[Christian Bauer]

  User: cbauer  
  Date: 08/01/14 00:10:47

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/dao 
                        WikiNodeDAO.java
  Log:
  JBSEAM-2457 - Render "REST" feed/file download URLs, breaks all current feed/file bookmarks
  
  Revision  Changes    Path
  1.7       +13 -1     jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiNodeDAO.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/dao/WikiNodeDAO.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- WikiNodeDAO.java	9 Jan 2008 18:12:01 -0000	1.6
  +++ WikiNodeDAO.java	14 Jan 2008 05:10:47 -0000	1.7
  @@ -415,6 +415,10 @@
           return null;
       }
   
  +    public WikiDirectory findWikiDirectoryInAreaUnrestricted(Long areaNumber, String wikiname) {
  +        return findWikiDirectoryInArea(areaNumber, wikiname, entityManager);
  +    }
  +
       public WikiDirectory findWikiDirectoryInArea(Long areaNumber, String wikiname) {
           return findWikiDirectoryInArea(areaNumber, wikiname, restrictedEntityManager);
       }
  @@ -434,9 +438,17 @@
           return null;
       }
   
  +    public WikiDirectory findAreaUnrestricted(String wikiname) {
  +        return findArea(wikiname, entityManager);
  +    }
  +
       public WikiDirectory findArea(String wikiname) {
  +        return findArea(wikiname, restrictedEntityManager);
  +    }
  +
  +    public WikiDirectory findArea(String wikiname, EntityManager em) {
           try {
  -            return (WikiDirectory) restrictedEntityManager
  +            return (WikiDirectory) em
                       .createQuery("select d from WikiDirectory d left join fetch d.feed, WikiDirectory r where r.parent is null and d.parent = r and d.wikiname = :wikiname")
                       .setParameter("wikiname", wikiname)
                       .setHint("org.hibernate.comment", "Find area by wikiname")