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

[Christian Bauer]

  User: cbauer  
  Date: 07/03/08 05:44:15

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui    
                        WikiTextParser.java Converters.java
                        FileServlet.java UIWikiFormattedText.java
  Log:
  Added TestNG support to build and IntelliJ config
  
  Revision  Changes    Path
  1.2       +0 -2      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextParser.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiTextParser.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiTextParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- WikiTextParser.java	7 Mar 2007 18:37:39 -0000	1.1
  +++ WikiTextParser.java	8 Mar 2007 10:44:15 -0000	1.2
  @@ -41,8 +41,6 @@
           Expressions.MethodBinding method = Expressions.instance()
                   .createMethodBinding("#{wikiLinkResolver.resolveWikiLink(linkMap,linkText)}");
           method.invoke();
  -        //noinspection unchecked
  -        links = (Map<String, WikiLink>)Contexts.getEventContext().get("linkMap");
   
           WikiLink link = links.get((linkText));
   
  
  
  
  1.2       +7 -3      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Converters.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/Converters.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Converters.java	7 Mar 2007 18:37:39 -0000	1.1
  +++ Converters.java	8 Mar 2007 10:44:15 -0000	1.2
  @@ -1,14 +1,14 @@
   package org.jboss.seam.wiki.core.ui;
   
  -import org.jboss.seam.Component;
   import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.wiki.core.dao.UserDAO;
  +import org.jboss.seam.annotations.Transactional;
   import org.jboss.seam.wiki.core.model.Role;
   
   import javax.faces.component.UIComponent;
   import javax.faces.context.FacesContext;
   import javax.faces.convert.Converter;
   import javax.faces.convert.ConverterException;
  +import javax.persistence.EntityManager;
   import java.io.Serializable;
   
   public class Converters {
  @@ -17,12 +17,16 @@
       @org.jboss.seam.annotations.jsf.Converter(forClass = Role.class)
       public static class RoleConverter implements Converter, Serializable {
   
  +        @Transactional
           public Object getAsObject(FacesContext arg0,
                                     UIComponent arg1,
                                     String arg2) throws ConverterException {
               if (arg2 == null) return null;
               try {
  -                return ((UserDAO) Component.getInstance("userDAO")).findRole(Long.valueOf(arg2));
  +                EntityManager em = ((EntityManager)org.jboss.seam.Component.getInstance("entityManager"));
  +                em.joinTransaction();
  +
  +                return arg2 != null ? em.find(Role.class, Long.valueOf(arg2)) : null;
               } catch (NumberFormatException e) {
                   throw new ConverterException("Cannot find selected role", e);
               }
  
  
  
  1.2       +4 -7      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FileServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/FileServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FileServlet.java	7 Mar 2007 18:37:39 -0000	1.1
  +++ FileServlet.java	8 Mar 2007 10:44:15 -0000	1.2
  @@ -24,9 +24,6 @@
   
       private static final String DOWNLOAD_PATH = "/download";
   
  -    @In
  -    EntityManager entityManager;
  -
       /**
        * The maximum width allowed for image rescaling
        */
  @@ -73,10 +70,10 @@
                       userTx.begin();
                   }
   
  -                file = (!"".equals(id)) ?
  -                        ((EntityManager)org.jboss.seam.Component.getInstance("entityManager"))
  -                                .find(File.class, Long.parseLong(id))
  -                        : null;
  +                EntityManager em = ((EntityManager)org.jboss.seam.Component.getInstance("entityManager"));
  +                em.joinTransaction();
  +
  +                file = (!"".equals(id)) ? em.find(File.class, Long.parseLong(id)) : null;
   
                   if (startedTx) userTx.commit();
               } catch (Exception ex) {
  
  
  
  1.2       +6 -1      jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIWikiFormattedText.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/UIWikiFormattedText.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UIWikiFormattedText.java	7 Mar 2007 18:37:39 -0000	1.1
  +++ UIWikiFormattedText.java	8 Mar 2007 10:44:15 -0000	1.2
  @@ -6,9 +6,9 @@
   
   import javax.faces.component.UIOutput;
   import javax.faces.context.FacesContext;
  +import javax.persistence.EntityManager;
   
   import org.jboss.seam.text.SeamTextLexer;
  -import org.jboss.seam.wiki.core.ui.WikiTextParser;
   import org.jboss.seam.contexts.Contexts;
   
   import antlr.ANTLRException;
  @@ -50,6 +50,11 @@
   
           context.getResponseWriter().write(parser.toString());
   
  +        // Flush persistence context after parsing/rendering - resolved and updated links need to be stored
  +        EntityManager em = ((EntityManager)org.jboss.seam.Component.getInstance("entityManager"));
  +        em.joinTransaction();
  +        em.flush();
  +
           // Put attachments (wiki links...) into the event context for later rendering
           Contexts.getEventContext().set("wikiTextAttachments", parser.getAttachments());
       }