[jboss-cvs] jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/07 07:40:12

  Modified:    examples/seambay/src/org/jboss/seam/example/seambay  
                        AuctionAction.java AuctionService.java
  Log:
  fixes
  
  Revision  Changes    Path
  1.5       +3 -3      jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- AuctionAction.java	1 May 2007 01:31:48 -0000	1.4
  +++ AuctionAction.java	7 Jun 2007 11:40:12 -0000	1.5
  @@ -1,10 +1,9 @@
   package org.jboss.seam.example.seambay;
   
  -import static org.jboss.seam.ScopeType.SESSION;
  +import static org.jboss.seam.ScopeType.CONVERSATION;
   
   import java.io.Serializable;
   import java.util.Calendar;
  -import java.util.Date;
   import java.util.GregorianCalendar;
   
   import javax.persistence.EntityManager;
  @@ -17,7 +16,7 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.security.Restrict;
   
  - at Scope(SESSION)
  + at Scope(CONVERSATION)
   @Name("auctionAction")
   @Restrict("#{identity.loggedIn}")
   public class AuctionAction implements Serializable
  @@ -40,6 +39,7 @@
         if (auction == null)
         {
            auction = new Auction();
  +         auction.setAuctionId(-123); // TODO create a temporary auction ID
            auction.setAccount(authenticatedAccount);
            auction.setStatus(Auction.STATUS_UNLISTED);   
         }
  
  
  
  1.11      +11 -9     jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionService.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- AuctionService.java	3 May 2007 03:23:12 -0000	1.10
  +++ AuctionService.java	7 Jun 2007 11:40:12 -0000	1.11
  @@ -7,11 +7,15 @@
   import javax.jws.WebService;
   
   import org.jboss.seam.Component;
  -import org.jboss.seam.core.Manager;
  +import org.jboss.seam.annotations.Conversation;
  +import org.jboss.seam.annotations.ConversationId;
  +import org.jboss.seam.annotations.Name;
   import org.jboss.seam.security.Identity;
   
   @Stateless
   @WebService
  + at Name("auctionService")
  + at Conversation("createAuction")
   public class AuctionService implements AuctionServiceRemote
   {         
      @WebMethod
  @@ -53,19 +57,18 @@
      }
      
      @WebMethod
  -   public Auction getNewAuctionDetails(int auctionId)
  +   public Auction getNewAuctionDetails(@ConversationId int auctionId)
      {
         AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
         
  -      action.editAuction(auctionId);
  -      
         // TODO remove the auction image from the result
         
         return action.getAuction();
      }
      
      @WebMethod
  -   public void updateAuction(int auctionId, String title, String description, int categoryId)
  +   public void updateAuction(@ConversationId int auctionId, String title, 
  +         String description, int categoryId)
      {
         AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
         
  @@ -74,16 +77,15 @@
      }
      
      @WebMethod
  -   public void setAuctionDuration(int auctionId, int days)
  +   public void setAuctionDuration(@ConversationId int auctionId, int days)
      {
  -      Manager.instance().restoreConversation("" + auctionId);
         AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
         
         action.setDuration(days);
      }
      
      @WebMethod
  -   public void confirmAuction(int auctionId)
  +   public void confirmAuction(@ConversationId int auctionId)
      {
         AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);