User: schaefera
  Date: 02/04/16 22:07:24

  Modified:    src/main/org/jboss/test/banknew/ejbeans Tag: Branch_2_4
                        AccountBean.java BankBean.java CustomerBean.java
  Added:       src/main/org/jboss/test/banknew/ejbeans Tag: Branch_2_4
                        AccountSessionBean.java BankSessionBean.java
                        CustomerSessionBean.java TellerSessionBean.java
                        TransactionBean.java
  Removed:     src/main/org/jboss/test/banknew/ejbeans Tag: Branch_2_4
                        TellerBean.java
  Log:
  Redesigned the banknew example therefore to a create separation between
  the Entity Bean (CMP) and the Session Beans (Business Logic).
  The test cases are redesigned but not finished yet.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +40 -73    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/AccountBean.java
  
  Index: AccountBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/AccountBean.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- AccountBean.java  15 Apr 2002 04:28:15 -0000      1.1.2.2
  +++ AccountBean.java  17 Apr 2002 05:07:24 -0000      1.1.2.3
  @@ -10,13 +10,13 @@
   
   import org.jboss.test.util.ejb.EntitySupport;
   import org.jboss.test.banknew.interfaces.AccountData;
  -// import org.jboss.test.banknew.interfaces.Customer;
  +import org.jboss.test.banknew.interfaces.AccountPK;
   
   /**
    * The Entity bean represents a bank account
    *
    * @author Andreas Schaefer
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    *
    * @ejb:bean name="bank/Account"
    *           display-name="Bank Account Entity"
  @@ -31,16 +31,21 @@
    *
    * @ejb:transaction type="Required"
    *
  - * @ejb:data-object setdata="false"
  + * @ejb:data-object setdata="true"
    *                  extends="java.lang.Object"
    *
    * @ejb:finder signature="java.util.Collection findAll()"
    *
  - * @ejb:finder signature="java.util.Collection findLargeAccounts( int 
pMinimumBalance )"
  + * @ejb:finder signature="java.util.Collection findByCustomer( String pCustomerId )"
    *
  - * @jboss:finder-query name="findLargeAccounts"
  - *                     query="Balance < {0}"
  - *                     order="Balance"
  + * @jboss:finder-query name="findByCustomer"
  + *                     query="Customer_Id = {0}"
  + *                     order="Type"
  + *
  + * @ejb:finder signature="org.jboss.test.banknew.interfaces.Account 
findByCustomerAndType( String pCustomerId, int pType )"
  + *
  + * @jboss:finder-query name="findByCustomerAndType"
  + *                     query="Customer_Id = {0} AND Type = {1}"
    *
    * @jboss:table-name table-name="Account"
    *
  @@ -53,9 +58,6 @@
   {
      // Constants -----------------------------------------------------
       
  -   public static final String COMP_NAME = "java:comp/env/ejb/bank/Account";
  -   public static final String JNDI_NAME = "ejb/bank/Account";
  -   
      // Attributes ----------------------------------------------------
      
      // Static --------------------------------------------------------
  @@ -72,109 +74,79 @@
       **/
      abstract public String getId();
      
  -   abstract public void setId(String id);
  +   abstract public void setId( String pId );
      
      /**
       * @ejb:persistent-field
  -    * @ejb:interface-method view-type="remote"
       *
  -    * @jboss:column-name name="Balance"
  +    * @jboss:column-name name="Customer_Id"
       **/
  -   abstract public float getBalance();
  +   abstract public String getCustomerId();
      
  -   /**
  -    * @ejb:interface-method view-type="remote"
  -    **/
  -   abstract public void setBalance(float balance);
  +   abstract public void setCustomerId( String pCustomerId );
      
      /**
       * @ejb:persistent-field
  -    * @ejb:interface-method view-type="remote"
       *
  -    * @jboss:column-name name="Customer_Id"
  +    * @jboss:column-name name="Type"
       **/
  -   public abstract String getOwnerId();
  +   abstract public int getType();
      
  -   public abstract void setOwnerId( String pCustomerId );
  +   abstract public void setType( int pType );
      
      /**
  +    * @ejb:persistent-field
       * @ejb:interface-method view-type="remote"
  +    *
  +    * @jboss:column-name name="Balance"
       **/
  -   public void deposit(float amount)
  -   {
  -      setBalance(getBalance()+amount);
  -   }
  +   abstract public float getBalance();
      
  -   /**
  -    * @ejb:interface-method view-type="remote"
  -    **/
  -   public void withdraw(float amount)
  -   {
  -      setBalance(getBalance()-amount);
  -   }
  +   abstract public void setBalance( float pAmount );
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public void setData(AccountData data)
  -   {
  -      setBalance(data.getBalance());
  -      setOwnerId(data.getOwnerId());
  -   }
  +   public abstract void setData( AccountData pData );
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public AccountData getData()
  -   {
  -      AccountData data = new AccountData();
  -      data.setId( getId() );
  -      data.setBalance( getBalance() );
  -      data.setOwnerId( getOwnerId() );
  -      return data;
  -   }
  +   public abstract AccountData getData();
      
  -   protected abstract void makeDirty();
  +//   protected abstract void makeDirty();
      
  -   protected abstract void makeClean();
  +//   protected abstract void makeClean();
      
      // EntityBean implementation -------------------------------------
      /**
       * @ejb:create-method view-type="remote"
       **/
  -   public String ejbCreate(AccountData data) 
  -      throws RemoteException, CreateException
  -   { 
  -      setId( data.getId() );
  -      setData( data );
  -      makeClean();
  +   public AccountPK ejbCreate( AccountData pData )
  +      throws CreateException
  +   {
  +      setId( pData.getCustomerId() + ":" + pData.getType() );
  +      setData( pData );
  +      
         return null;
      }
      
  -   public void ejbPostCreate(AccountData data) 
  -      throws RemoteException, CreateException
  +   public void ejbPostCreate( AccountData data ) 
  +      throws CreateException
      { 
      }
  -   
  -   public void ejbLoad()
  -      throws RemoteException
  -   {
  -      super.ejbLoad();
  -      makeClean();
  -   }
  -   public void ejbStore()
  -      throws RemoteException
  -   {
  -      super.ejbStore();
  -      makeClean();
  -   }
   }
   
   /*
  - *   $Id: AccountBean.java,v 1.1.2.2 2002/04/15 04:28:15 schaefera Exp $
  + *   $Id: AccountBean.java,v 1.1.2.3 2002/04/17 05:07:24 schaefera Exp $
    *   Currently locked by:$Locker:  $
    *   Revision:
    *   $Log: AccountBean.java,v $
  + *   Revision 1.1.2.3  2002/04/17 05:07:24  schaefera
  + *   Redesigned the banknew example therefore to a create separation between
  + *   the Entity Bean (CMP) and the Session Beans (Business Logic).
  + *   The test cases are redesigned but not finished yet.
  + *
    *   Revision 1.1.2.2  2002/04/15 04:28:15  schaefera
    *   Minor fixes regarding to the JNDI names of the beans.
    *
  @@ -194,7 +166,4 @@
    *
    *   Revision 1.1.1.1  2000/06/21 15:52:37  oberg
    *   Initial import of jBoss test. This module contains CTS tests, some simple 
examples, and small bean suites.
  - *
  - *
  - *  
    */
  
  
  
  1.1.2.3   +66 -64    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/BankBean.java
  
  Index: BankBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/BankBean.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- BankBean.java     15 Apr 2002 04:28:15 -0000      1.1.2.2
  +++ BankBean.java     17 Apr 2002 05:07:24 -0000      1.1.2.3
  @@ -4,22 +4,23 @@
    */
   package org.jboss.test.banknew.ejbeans;
   
  -import java.rmi.*;
  -import javax.naming.*;
  -import javax.ejb.*;
  +// import java.rmi.*;
  +// import javax.naming.*;
  +import javax.ejb.CreateException;
   
  -import org.jboss.test.util.ejb.SessionSupport;
  -import org.jboss.test.banknew.interfaces.Customer;
  +import org.jboss.test.banknew.interfaces.BankData;
  +import org.jboss.test.banknew.interfaces.BankPK;
  +import org.jboss.test.util.ejb.EntitySupport;
   
   /**
    * The Session bean represents a bank.
    *
    * @author Andreas Schaefer
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    *
    * @ejb:bean name="bank/Bank"
  - *           display-name="Bank Session"
  - *           type="Stateless"
  + *           display-name="Bank Entity"
  + *           type="CMP"
    *           jndi-name="ejb/bank/Bank"
    *
    * @ejb:interface extends="javax.ejb.EJBObject"
  @@ -28,96 +29,99 @@
    *
    * @ejb:pk extends="java.lang.Object"
    *
  + * @ejb:data-object extends="java.lang.Object"
  + *                  generate="true"
  + *
  + * @ejb:finder signature="java.util.Collection findAll()"
  + *
    * @ejb:transaction type="Required"
    *
  - * @ejb:env-entry name="id"
  - *                type="java.lang.String"
  - *                value="5678"
  + * @jboss:table-name table-name="Bank"
  + *
  + * @jboss:create-table create="true"
  + *
  + * @jboss:remove-table remove="true"
    */
  -public class BankBean
  -   extends SessionSupport
  +public abstract class BankBean
  +   extends EntitySupport
   {
      // Constants -----------------------------------------------------
      
  -   public static final String COMP_NAME = "java:comp/env/ejb/bank/Bank";
  -   public static final String JNDI_NAME = "ejb/bank/Bank";
  -    
      // Attributes ----------------------------------------------------
      
  -   static final String ID = "java:comp/env/id";
  -   String id;
  -   
      // Static --------------------------------------------------------
      
  -   static long nextAccountId = System.currentTimeMillis();
  -   static long nextCustomerId = System.currentTimeMillis();
  -   
      // Constructors --------------------------------------------------
      
      // Public --------------------------------------------------------
      
      /**
  -    * @ejb:interface-method view-type="remote"
  +    * @ejb:persistent-field
  +    * @ejb:pk-field
  +    *
  +    * @jboss:column-name name="Id"
       **/
  -   public String getId()
  -   {
  -      return id;
  -   }
  +   public abstract String getId();
  +   
  +   public abstract void setId( String pId );
  +   
  +   /**
  +    * @ejb:persistent-field
  +    *
  +    * @jboss:column-name name="Name"
  +    **/
  +   public abstract String getName();
  +   
  +   public abstract void setName( String pName );
  +   
  +   /**
  +    * @ejb:persistent-field
  +    *
  +    * @jboss:column-name name="Address"
  +    **/
  +   public abstract String getAddress();
  +   
  +   public abstract void setAddress( String pAddress );
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public String createAccountId(Customer customer)
  -      throws RemoteException
  -   {
  -      return getId()+"."+customer.getName()+"."+(nextAccountId++);
  -   }
  +   public abstract void setData( BankData pData );
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public String createCustomerId()
  -   {
  -      return getId() + "." + ( nextCustomerId++ );
  -   }
  +   public abstract BankData getData();
  +   
  +   // EntityBean implementation -------------------------------------
      
  -   // SessionBean implementation ------------------------------------
  -   public void setSessionContext(SessionContext context) 
  -   {
  -      super.setSessionContext(context);
  +   /**
  +    * @ejb:create-method view-type="remote"
  +    **/
  +   public BankPK ejbCreate( String pName, String pAddress ) 
  +      throws CreateException
  +   { 
  +      setId( "Bank ( " + System.currentTimeMillis() + " )" );
  +      setName( pName );
  +      setAddress( pAddress );
         
  -      try
  -      {
  -         id = (String) new InitialContext().lookup( ID );
  -      } catch (Exception e)
  -      {
  -         System.out.println(e);
  -         throw new EJBException(e);
  -      }
  +      return null;
  +   }
  +   
  +   public void ejbPostCreate( String pName, String pAddress ) 
  +      throws CreateException
  +   { 
      }
   }
   
   /*
  - *   $Id: BankBean.java,v 1.1.2.2 2002/04/15 04:28:15 schaefera Exp $
  + *   $Id: BankBean.java,v 1.1.2.3 2002/04/17 05:07:24 schaefera Exp $
    *   Currently locked by:$Locker:  $
    *   Revision:
    *   $Log: BankBean.java,v $
  - *   Revision 1.1.2.2  2002/04/15 04:28:15  schaefera
  - *   Minor fixes regarding to the JNDI names of the beans.
  - *
  - *   Revision 1.1.2.1  2002/04/15 02:32:24  schaefera
  - *   Add a new test version of the bank because the old did no use transactions
  - *   and the new uses XDoclet 1.1.2 to generate the DDs and other Java classes.
  - *   Also a marathon test is added. Please specify the jbosstest.duration for
  - *   how long and the test.timeout (which must be longer than the duration) to
  - *   run the test with run_tests.xml, tag marathon-test-and-report.
  - *
  - *   Revision 1.2  2001/01/07 23:14:34  peter
  - *   Trying to get JAAS to work within test suite.
  - *
  - *   Revision 1.1.1.1  2000/06/21 15:52:37  oberg
  - *   Initial import of jBoss test. This module contains CTS tests, some simple 
examples, and small bean suites.
  - *
  + *   Revision 1.1.2.3  2002/04/17 05:07:24  schaefera
  + *   Redesigned the banknew example therefore to a create separation between
  + *   the Entity Bean (CMP) and the Session Beans (Business Logic).
  + *   The test cases are redesigned but not finished yet.
    *
  - *  
    */
  
  
  
  1.1.2.3   +37 -53    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/CustomerBean.java
  
  Index: CustomerBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/CustomerBean.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- CustomerBean.java 15 Apr 2002 04:28:15 -0000      1.1.2.2
  +++ CustomerBean.java 17 Apr 2002 05:07:24 -0000      1.1.2.3
  @@ -4,19 +4,15 @@
    */
   package org.jboss.test.banknew.ejbeans;
   
  -import java.util.*;
  -
  -import javax.naming.InitialContext;
  -
  -import org.jboss.test.util.ejb.EntitySupport;
  -import org.jboss.test.banknew.interfaces.Account;
  +import org.jboss.test.banknew.interfaces.CustomerData;
   import org.jboss.test.banknew.interfaces.CustomerPK;
  +import org.jboss.test.util.ejb.EntitySupport;
   
   /**
    * The Entity bean represents a bank customer
    *
    * @author Andreas Schaefer
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    *
    * @ejb:bean name="bank/Customer"
    *           display-name="Bank Customer Entity"
  @@ -31,11 +27,17 @@
    *
    * @ejb:transaction type="Required"
    *
  - * @ejb:data-object setdata="false"
  - *                  extends="java.lang.Object"
  + * @ejb:data-object extends="java.lang.Object"
  + *                  setdata="true"
    *
    * @ejb:finder signature="java.util.Collection findAll()"
    *
  + * @ejb:finder signature="java.util.Collection findByBank( String pBankId )"
  + *
  + * @jboss:finder-query name="findByBank"
  + *                     query="Bank_Id = {0}"
  + *                     order="Bank_Id"
  + *
    * @jboss:table-name table-name="Customer"
    *
    * @jboss:create-table create="true"
  @@ -47,95 +49,82 @@
   {
      // Constants -----------------------------------------------------
       
  -   public static final String COMP_NAME = "java:comp/env/ejb/bank/Customer";
  -   public static final String JNDI_NAME = "ejb/bank/Customer";
  -   
      // Attributes ----------------------------------------------------
      
  -   public Collection accounts;
  -   
      // Static --------------------------------------------------------
      
  +   public static int sId = 0;
  +   
      // Constructors --------------------------------------------------
      
      // Public --------------------------------------------------------
  +   
      /**
       * @ejb:persistent-field
       * @ejb:pk-field
  -    * @ejb:interface-method view-type="remote"
       *
       * @jboss:column-name name="Id"
       **/
      abstract public String getId();
      
  -   abstract public void setId(String id);
  +   abstract public void setId( String pId );
      
      /**
       * @ejb:persistent-field
  -    * @ejb:pk-field
  -    * @ejb:interface-method view-type="remote"
       *
  -    * @jboss:column-name name="Name"
  +    * @jboss:column-name name="Bank_Id"
       **/
  -   abstract public String getName();
  +   abstract public String getBankId();
      
  -   /**
  -    * @ejb:interface-method view-type="remote"
  -    **/
  -   abstract public void setName(String name);
  +   abstract public void setBankId( String pBankId );
      
      /**
  -    * @ejb:interface-method view-type="remote"
  +    * @ejb:persistent-field
  +    *
  +    * @jboss:column-name name="Name"
       **/
  -   public Collection getAccounts()
  -   {
  -             return accounts;
  -   }
  +   abstract public String getName();
  +   
  +   abstract public void setName( String pName );
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public void addAccount(Account acct)
  -   {
  -             accounts.add(acct);
  -   }
  +   public abstract CustomerData getData();
      
      /**
       * @ejb:interface-method view-type="remote"
       **/
  -   public void removeAccount(Account acct)
  -   {
  -             accounts.remove(acct);
  -   }
  +   public abstract void setData( CustomerData pData );
      
      // EntityHome implementation -------------------------------------
  +   
      /**
  -    *
       * @ejb:create-method view-type="remote"
       **/
  -   public CustomerPK ejbCreate(String id, String name) 
  -   { 
  -      setId(id);
  -      setName(name);
  -      accounts = new ArrayList();
  +   public CustomerPK ejbCreate( String pBankId, String pName ) {
  +      setId( "Customer: " + ( sId++ ) );
  +      setBankId( pBankId );
  +      setName( pName );
         
  -      CustomerPK pk = new CustomerPK();
  -      pk.id = id;
  -      pk.name = name;
  -
  -      return pk;
  +      return null;
      }
      
  -   public void ejbPostCreate(String id, String name) 
  +   public void ejbPostCreate( String pBankId, String pName ) 
      { 
      }
   }
   
   /*
  - *   $Id: CustomerBean.java,v 1.1.2.2 2002/04/15 04:28:15 schaefera Exp $
  + *   $Id: CustomerBean.java,v 1.1.2.3 2002/04/17 05:07:24 schaefera Exp $
    *   Currently locked by:$Locker:  $
    *   Revision:
    *   $Log: CustomerBean.java,v $
  + *   Revision 1.1.2.3  2002/04/17 05:07:24  schaefera
  + *   Redesigned the banknew example therefore to a create separation between
  + *   the Entity Bean (CMP) and the Session Beans (Business Logic).
  + *   The test cases are redesigned but not finished yet.
  + *
    *   Revision 1.1.2.2  2002/04/15 04:28:15  schaefera
    *   Minor fixes regarding to the JNDI names of the beans.
    *
  @@ -157,7 +146,4 @@
    *
    *   Revision 1.1.1.1  2000/06/21 15:52:37  oberg
    *   Initial import of jBoss test. This module contains CTS tests, some simple 
examples, and small bean suites.
  - *
  - *
  - *  
    */
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +302 -0    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/AccountSessionBean.java
  
  
  
  
  1.1.2.1   +198 -0    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/BankSessionBean.java
  
  
  
  
  1.1.2.1   +227 -0    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/CustomerSessionBean.java
  
  
  
  
  1.1.2.1   +323 -0    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/TellerSessionBean.java
  
  
  
  
  1.1.2.1   +190 -0    
jbosstest/src/main/org/jboss/test/banknew/ejbeans/Attic/TransactionBean.java
  
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to