Tolven Health Record

Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31885/src/org/tolven/core/bean

Modified Files:
      Tag: BUG_1809965_TopLinkSynchTests
	AccountDAOBean.java ActivationBean.java 
Log Message:
BUG_1809965_TopLinkSynchTests The changes capture changes that were made while analyzing the differences between hibernage and toplink with respect to persistence. The main application has undergone a number of changes in its intialization, resulting in some of this code no longer being used. However, come changes will need to be synch'd to HEAD.

Index: AccountDAOBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v
retrieving revision 1.33.18.1
retrieving revision 1.33.18.1.2.1
diff -C2 -d -r1.33.18.1 -r1.33.18.1.2.1
*** AccountDAOBean.java	17 Oct 2007 08:47:04 -0000	1.33.18.1
--- AccountDAOBean.java	13 Nov 2007 05:24:17 -0000	1.33.18.1.2.1
***************
*** 368,379 ****
    	*/
   	public AccountType findAccountTypebyKnownType( String knownType ) {
!  		List<String> activeStatus = new ArrayList<String>();
!  		activeStatus.add(Status.ACTIVE.value()); 
! 	   	activeStatus.add( Status.OLD_ACTIVE.value()); 
! 	   	activeStatus.add( Status.NEW.value()); 
!  		Query q = em.createQuery("SELECT acty FROM AccountType acty WHERE acty.knownType = :kt" +
!  				" and acty.status IN (:activeStatus) " );
   		q.setParameter("kt", knownType);
-  		q.setParameter("activeStatus", activeStatus);
   		List<AccountType> accountTypes = q.getResultList();
   		if (accountTypes.size()==1) return accountTypes.get(0);
--- 368,377 ----
    	*/
   	public AccountType findAccountTypebyKnownType( String knownType ) {
! 	   	Query q = em.createQuery("SELECT acty FROM AccountType acty WHERE acty.knownType = :kt" +
! 	   	        " AND acty.status IN ('" +
!     	   	        Status.ACTIVE.value() + "','" +
!     	   	        Status.OLD_ACTIVE.value() + "', '" +
!     	   	        Status.NEW.value() + "') " );
   		q.setParameter("kt", knownType);
   		List<AccountType> accountTypes = q.getResultList();
   		if (accountTypes.size()==1) return accountTypes.get(0);

Index: ActivationBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/ActivationBean.java,v
retrieving revision 1.36.130.1
retrieving revision 1.36.130.1.2.1
diff -C2 -d -r1.36.130.1 -r1.36.130.1.2.1
*** ActivationBean.java	17 Oct 2007 08:47:04 -0000	1.36.130.1
--- ActivationBean.java	13 Nov 2007 05:24:17 -0000	1.36.130.1.2.1
***************
*** 291,300 ****
        public long countUserAccounts( TolvenUser user )
        {
!    		List<String> activeStatus = new ArrayList<String>();
! 		activeStatus.add(Status.ACTIVE.value()); 
! 		activeStatus.add( Status.OLD_ACTIVE.value()); 
! 		Query query = em.createQuery("SELECT COUNT(au) FROM AccountUser au WHERE au.user = :user AND au.status IN (:activeStatus)");
  		query.setParameter("user", user);
-  		query.setParameter("activeStatus", activeStatus);
  		Long rslt = (Long) query.getSingleResult();
  		return rslt.longValue();
--- 291,296 ----
        public long countUserAccounts( TolvenUser user )
        {
! 		Query query = em.createQuery("SELECT COUNT(au) FROM AccountUser au WHERE au.user = :user AND au.status IN ('" + Status.ACTIVE.value() + "','" + Status.OLD_ACTIVE.value() + "')");
  		query.setParameter("user", user);
  		Long rslt = (Long) query.getSingleResult();
  		return rslt.longValue();