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

[Christian Bauer]

  User: cbauer  
  Date: 07/06/04 04:06:37

  Modified:    examples/wiki/src/main/org/jboss/seam/wiki/core/ui 
                        FileServlet.java
  Log:
  New transaction handling in Seam 1.3
  
  Revision  Changes    Path
  1.7       +7 -8      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- FileServlet.java	8 Apr 2007 15:10:35 -0000	1.6
  +++ FileServlet.java	4 Jun 2007 08:06:36 -0000	1.7
  @@ -1,22 +1,20 @@
   package org.jboss.seam.wiki.core.ui;
   
   import org.jboss.seam.wiki.core.model.File;
  -import org.jboss.seam.util.Transactions;
  -import org.jboss.seam.*;
   
   import javax.imageio.ImageIO;
  +import javax.persistence.EntityManager;
  +import javax.persistence.NoResultException;
  +import javax.servlet.ServletException;
  +import javax.servlet.http.HttpServlet;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  -import javax.servlet.http.HttpServlet;
  -import javax.servlet.ServletException;
   import javax.swing.*;
  -import javax.persistence.EntityManager;
  -import javax.persistence.NoResultException;
   import javax.transaction.UserTransaction;
   import java.awt.*;
   import java.awt.image.BufferedImage;
  -import java.io.IOException;
   import java.io.ByteArrayOutputStream;
  +import java.io.IOException;
   import java.io.InputStream;
   
   public class FileServlet extends HttpServlet {
  @@ -63,7 +61,8 @@
               UserTransaction userTx = null;
               boolean startedTx = false;
               try {
  -                userTx = Transactions.getUserTransaction();
  +
  +                userTx = (UserTransaction)org.jboss.seam.Component.getInstance("org.jboss.seam.transaction.transaction");
                   if (userTx.getStatus() != javax.transaction.Status.STATUS_ACTIVE) {
                       startedTx = true;
                       userTx.begin();