tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security/bean LoginBean.java, 1.7, 1.7.2.1 AccountProcessingProtectionBean.java, 1.1.2.1, 1.1.2.2

[Joseph I. <jos...@us...>]

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

Modified Files:
      Tag: E_JI_MDBKeys
	LoginBean.java AccountProcessingProtectionBean.java 
Log Message:
Introducing an MDB user with principal accountprocessingQ,  for the rule queue, which will allow messages to be encrypted while on the queue.

Index: AccountProcessingProtectionBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/Attic/AccountProcessingProtectionBean.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** AccountProcessingProtectionBean.java	28 Mar 2007 05:13:23 -0000	1.1.2.1
--- AccountProcessingProtectionBean.java	30 Mar 2007 04:41:47 -0000	1.1.2.2
***************
*** 19,23 ****
  import java.security.GeneralSecurityException;
  import java.security.PrivateKey;
- import java.security.PublicKey;
  import java.util.Set;
  
--- 19,22 ----
***************
*** 40,44 ****
  import org.tolven.security.key.DocumentSecretKey;
  import org.tolven.security.key.UserPrivateKey;
- import org.tolven.security.key.UserPublicKey;
  
  /**
--- 39,42 ----
***************
*** 60,83 ****
              throw new RuntimeException("Cannot find account Id=" + tm.getAccountId() + " for TolvenMessage");
          AccountProcessingPublicKey accountProcessingPublicKey = account.getAccountProcessingPublicKey();
!         if (accountProcessingPublicKey == null) {
!             LoginContext lc = null;
!             try {
!                 lc = new LoginContext("tolvenLDAP", new KeyLdapCallbackHandler(processingId, processingId.toCharArray()));
!                 lc.login();
!                 Subject subject = lc.getSubject();
!                 Set<UserPublicKey> publicCredentials = subject.getPublicCredentials(UserPublicKey.class);
!                 UserPublicKey userPublicKey = publicCredentials.iterator().next();
!                 if (userPublicKey == null)
!                     throw new GeneralSecurityException(getClass() + " :No UserPublicKey found for " + processingId);
!                 AccountProcessingPrivateKey accountProcessingPrivateKey = AccountProcessingPrivateKey.getInstance();
!                 account.setAccountProcessingPrivateKey(accountProcessingPrivateKey);
!                 PublicKey publicKey = accountProcessingPrivateKey.init(userPublicKey.getPublicKey());
!                 account.setAccountProcessingPublicKey(publicKey);
!             } finally {
!                 if (lc != null)
!                     lc.logout();
!             }
!         }
!         accountProcessingPublicKey = account.getAccountProcessingPublicKey();
          DocumentSecretKey documentSecretKey = DocumentSecretKey.getInstance();
          SecretKey docSecretKey = documentSecretKey.init(accountProcessingPublicKey.getPublicKey());
--- 58,63 ----
              throw new RuntimeException("Cannot find account Id=" + tm.getAccountId() + " for TolvenMessage");
          AccountProcessingPublicKey accountProcessingPublicKey = account.getAccountProcessingPublicKey();
!         if (accountProcessingPublicKey == null)
!             throw new RuntimeException("No AccountProcessingKey for account Id=" + account.getId());
          DocumentSecretKey documentSecretKey = DocumentSecretKey.getInstance();
          SecretKey docSecretKey = documentSecretKey.init(accountProcessingPublicKey.getPublicKey());

Index: LoginBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LoginBean.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** LoginBean.java	20 Mar 2007 09:13:07 -0000	1.7
--- LoginBean.java	30 Mar 2007 04:41:47 -0000	1.7.2.1
***************
*** 19,24 ****
  
  import org.tolven.admin.ActivateInvitation;
- import org.tolven.core.AccountDAOLocal;
- import org.tolven.core.ActivationLocal;
  import org.tolven.core.InvitationLocal;
  import org.tolven.core.bean.InvitationException;
--- 19,22 ----
***************
*** 45,50 ****
      @EJB private InvitationLocal invitationBean;
      @EJB private LDAPLocal ldapBean;
-     @EJB private AccountDAOLocal accountBean;
-     @EJB private ActivationLocal activationBean;;
  
      /**
--- 43,46 ----
***************
*** 74,78 ****
      }
  
!     private AccountUser findAccountUser(long accountUserId) {
          return em.find(AccountUser.class, accountUserId);
      }
--- 70,74 ----
      }
  
!     public AccountUser findAccountUser(long accountUserId) {
          return em.find(AccountUser.class, accountUserId);
      }

[Tolven-cvs-commit] tolvenWEB/web/manage editAccountProfile.xhtml, 1.4, 1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/manage
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11189/web/manage

Modified Files:
	editAccountProfile.xhtml 
Log Message:
Improve display of new exchange tables

Index: editAccountProfile.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editAccountProfile.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editAccountProfile.xhtml	29 Mar 2007 07:45:57 -0000	1.4
--- editAccountProfile.xhtml	29 Mar 2007 19:29:03 -0000	1.5
***************
*** 160,165 ****
             <h3>Account Exchange - Send</h3>
  	         <h:form id="exchangeSend" >       
! 	         <p>A List of accounts you send patient data.</p>
!    		      <h:dataTable value="#{acc.accountExchangeSendModel}" var="aes" styleClass="activity">
  	            <h:column>
  	                <f:facet name="header">
--- 160,165 ----
             <h3>Account Exchange - Send</h3>
  	         <h:form id="exchangeSend" >       
! 	         <p>A List of accounts to which you can send data.</p>
!    		      <h:dataTable value="#{acc.accountExchangeSendModel}" var="aes" styleClass="manage" >
  	            <h:column>
  	                <f:facet name="header">
***************
*** 193,203 ****
                </h:panelGrid>
         	      <h:messages for="exchangeSend:sendAccount" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
-    	           <h:outputText value=" | | " />
  			  <h:commandLink value="Return to Application" action="dispatch" immediate="true"/>
  	        </h:form>
             <h3>Account Exchange - Receive</h3>
  	         <h:form id="exchangeReceive" >       
! 	         <p>A List of accounts you recive patient data.</p>
!    		      <h:dataTable value="#{acc.accountExchangeReceiveModel}" var="aer" styleClass="activity">
  	            <h:column>
  	                <f:facet name="header">
--- 193,202 ----
                </h:panelGrid>
         	      <h:messages for="exchangeSend:sendAccount" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
  			  <h:commandLink value="Return to Application" action="dispatch" immediate="true"/>
  	        </h:form>
             <h3>Account Exchange - Receive</h3>
  	         <h:form id="exchangeReceive" >       
! 	         <p>A List of accounts from which you receive data.</p>
!    		      <h:dataTable value="#{acc.accountExchangeReceiveModel}" var="aer" styleClass="manage">
  	            <h:column>
  	                <f:facet name="header">
***************
*** 231,235 ****
                </h:panelGrid>
         	      <h:messages for="exchangeReceive:sendAccount" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
-    	           <h:outputText value=" | | " />
  			  <h:commandLink value="Return to Application" action="dispatch" immediate="true"/>
  	        </h:form>
--- 230,233 ----

[Tolven-cvs-commit] tolvenWEB/web/styles echr.css,1.7,1.8

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/styles
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11189/web/styles

Modified Files:
	echr.css 
Log Message:
Improve display of new exchange tables

Index: echr.css
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/styles/echr.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** echr.css	27 Mar 2007 23:23:42 -0000	1.7
--- echr.css	29 Mar 2007 19:29:03 -0000	1.8
***************
*** 466,469 ****
--- 466,490 ----
  	PADDING-RIGHT: 1em; PADDING-LEFT: 1em; PADDING-BOTTOM: 0.5em; VERTICAL-ALIGN: top; PADDING-TOP: 0.5em; BORDER-RIGHT-STYLE: none; TEXT-ALIGN: left
  }
+ .manage  {
+ 	border-collapse:collapse;
+ 	width: 100%
+ }
+ .manage thead th {
+ 	BORDER: #666666 1px solid;
+ 	PADDING: 0.25em;  
+ }
+ .manage thead th.caption {
+ PADDING-RIGHT: 0px; PADDING-LEFT: 10px; PADDING-BOTTOM: 0.25em; MARGIN: 0px 0px 0em; FONT: bold italic 1em/1.6em Verdana, Arial, Helvetica, sans-serif; COLOR: #333333; PADDING-TOP: 0.5em; BORDER-BOTTOM: #999999 2px solid; BORDER-RIGHT-STYLE: none; TEXT-ALIGN: left
+ }
+ .manage tbody td {
+ 	PADDING-RIGHT: 0.5em;
+ 	PADDING-LEFT: 0.5em;
+ 	PADDING-BOTTOM: 0.25em;
+ 	VERTICAL-ALIGN: top;
+ 	PADDING-TOP: 0.25em;
+ 	BORDER: #666666 1px solid;
+ 	TEXT-ALIGN: left;
+ }
+ 
  .detail {
  	WIDTH: 100%

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/entity AccountExchange.java, 1.1, 1.2

[John C. <jc...@us...>]

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

Modified Files:
	AccountExchange.java 
Log Message:
Add serializable 

Index: AccountExchange.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/AccountExchange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccountExchange.java	29 Mar 2007 07:46:01 -0000	1.1
--- AccountExchange.java	29 Mar 2007 19:28:11 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  package org.tolven.core.entity;
  
+ import java.io.Serializable;
  import java.util.Date;
  
***************
*** 50,54 ****
  @Table(name = "ACCOUNT_EXCHANGE", schema="core")
  
! public class AccountExchange {
  	public enum Direction {SEND, RECEIVE};
  	
--- 51,58 ----
  @Table(name = "ACCOUNT_EXCHANGE", schema="core")
  
! public class AccountExchange implements Serializable {
! 
! 	private static final long serialVersionUID = 1L;
! 
  	public enum Direction {SEND, RECEIVE};
  	

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/entity AccountExchange.java, NONE, 1.1 Account.java, 1.18, 1.19

[John C. <jc...@us...>]

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

Modified Files:
	Account.java 
Added Files:
	AccountExchange.java 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

--- NEW FILE: AccountExchange.java ---
/*
 *  Copyright (C) 2007 Tolven Inc 
 *
 * This library is free software; you can redistribute it and/or modify it under the terms of 
 * the GNU Lesser General Public License as published by the Free Software Foundation; either 
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU Lesser General Public License for more details.
 * 
 * Contact: in...@to...
 */
package org.tolven.core.entity;

import java.util.Date;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;

/**
 * This entity represents allowable points of exchange between accounts. There are two types of objects 
 * due to the boundary between accounts.  These two types of entries generally work in pairs. Both sides must have active entries
 * for a message to exchange. 
 * A sender must be willing to send to a receiving account and
 * a receiver must be willing to receive from a sending account. Further, the roles may, but are not required,
 * to be reversed. If the reverse is not provided, then all communication between two parties will be one way.
 * Example of a complete, two-way channel: 
 * <ul>
 * <li>Patient is interested in sending to a provider</li>
 * <li>provider allows patient to send provider data</li>
 * <li>Provider is interested in sending to a patient</li>
 * <li>Patient allows provider to send patient data</li>
 * </ul>
 * <p>This entity has a separate id. This allows, over time, entries to be added and then subsequently
 * discontinued. In that case, a new agreement is a new row in the table. But only one row for each 
 * account/otherAccount/direction combination should exist at a time with a status of active.
 * @author John Churin
 */
@Entity
@Table(name = "ACCOUNT_EXCHANGE", schema="core")

public class AccountExchange {
	public enum Direction {SEND, RECEIVE};
	
    @Id
    @GeneratedValue(strategy=GenerationType.TABLE, generator="CORE_SEQ_GEN")
    private long id;

    @ManyToOne
    private Account account;
	
	@Enumerated( EnumType.STRING )
	private Direction direction;
	
    @ManyToOne
    private Account otherAccount;
    
    @Column( name="NAME")
    private String name;

    @Column( name="STATUS")
    private String status;
    
    @Temporal(TemporalType.TIMESTAMP)
    @Column( name="EFFECTIVE_TIME" )
    private Date effectiveTime;

    @Temporal(TemporalType.TIMESTAMP)
    @Column( name="EXPIRATION_TIME" )
    private Date expirationTime;

    /**
     * The account that owns this exchange
     * @return
     */
	public Account getAccount() {
		return account;
	}

	public void setAccount(Account account) {
		this.account = account;
	}
	/**
	 * The direction of the exchange (SEND or RECEIVE)
	 * @return
	 */
	public Direction getDirection() {
		return direction;
	}

	public void setDirection(Direction direction) {
		this.direction = direction;
	}

	/**
	 * The effective time of this exchange agreement
	 * @return
	 */
	public Date getEffectiveTime() {
		return effectiveTime;
	}

	public void setEffectiveTime(Date effectiveTime) {
		this.effectiveTime = effectiveTime;
	}
	/**
	 * The effective time of this exchange agreement
	 * @return
	 */
	public Date getExpirationTime() {
		return expirationTime;
	}

	public void setExpirationTime(Date expirationTime) {
		this.expirationTime = expirationTime;
	}
	/**
	 * Unique id of this exchange record
	 * @return
	 */
	public long getId() {
		return id;
	}

	public void setId(long id) {
		this.id = id;
	}
	/**
	 * The distal account. In the case of SEND, the account we want to send to. In the case
	 * of RECEIVE, the account we will allow to send to us.
	 * @return
	 */
	public Account getOtherAccount() {
		return otherAccount;
	}

	public void setOtherAccount(Account otherAccount) {
		this.otherAccount = otherAccount;
	}
	/**
	 * NEW means an exchange is pending. ACTIVE means the exchange agreement is active. This does not make any assumption about the
	 * other party. For example, while Account A says it is willing to receive from Account B, Account B may not
	 * be willing to send information to Account A. The status of the "other" end point can change
	 * independently of this account. Any other status suggests an exchange that is no longer ACTIVE and thus
	 * is not considered for exchange.
	 * @return
	 */
	public String getStatus() {
		return status;
	}

	public void setStatus(String status) {
		this.status = status;
	}

	/**
	 * The name of the connection. 
	 * @return
	 */
	public String getName() {
		return name;
	}

	public void setName(String name) {
		this.name = name;
	}
    
}

Index: Account.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/Account.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Account.java	24 Mar 2007 16:37:08 -0000	1.18
--- Account.java	29 Mar 2007 07:46:01 -0000	1.19
***************
*** 46,49 ****
--- 46,50 ----
      @GeneratedValue(strategy=GenerationType.TABLE, generator="CORE_SEQ_GEN")
      private long id;
+ 
      @Column( name="TITLE", length=50)
      private String title;

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/bean AccountDAOBean.java, 1.29, 1.30

[John C. <jc...@us...>]

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

Modified Files:
	AccountDAOBean.java 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

Index: AccountDAOBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** AccountDAOBean.java	8 Mar 2007 16:56:37 -0000	1.29
--- AccountDAOBean.java	29 Mar 2007 07:46:01 -0000	1.30
***************
*** 29,32 ****
--- 29,33 ----
  import org.tolven.core.SponsoredUser;
  import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.AccountExchange;
  import org.tolven.core.entity.AccountType;
  import org.tolven.core.entity.Sponsorship;
***************
*** 401,404 ****
--- 402,452 ----
      }
      
+     /**
+      * For a given account, return all valid accounts which this account can talk to.
+      * @param account
+      * @param direction
+      * @param complete A boolean that when true indicates that both parties in the exchange are in agreement
+      * about the exchange. False means that the "other party" need not have agreed to the exchange. For example,
+      * if the account administrator wants to see a list of other accounts that one could 
+      * potentially. communicate with.
+      * @return
+      */
+     public List<AccountExchange> findActiveEndPoints( Account account, AccountExchange.Direction direction, boolean complete ) {
+      	Query q;
+      	if (complete) {
+      		// Both ends must agree
+          	q = em.createQuery("SELECT ae FROM AccountExchange ae, AccountExchange aeo " +
+          		"WHERE ae.account = :account " +
+      			"AND aeo.account = ae.otherAccount " +
+      			"AND aeo.status = :status " +
+      			"AND aeo.direction = :otherDirection " +
+      			"AND ae.direction = :direction " +
+      			"AND ae.status = :status ");
+          	if (direction.equals(AccountExchange.Direction.SEND)) {
+              	q.setParameter("otherDirection", AccountExchange.Direction.RECEIVE);
+          	} else {
+              	q.setParameter("otherDirection", AccountExchange.Direction.SEND);
+          	}
+      	} else {
+          	q = em.createQuery("SELECT ae FROM AccountExchange ae " +
+          		"WHERE ae.account = :account " +
+          		"AND ae.direction = :direction " +
+          		"AND ae.status = :status");
+      	}
+      	q.setParameter("account", account);
+      	q.setParameter("direction", direction);
+      	q.setParameter("status", Status.ACTIVE.value());
+      	return q.getResultList();
+     }
+     
+     public AccountExchange newAccountExchange( Account account, Account otherAccount, AccountExchange.Direction direction ) {
+     	AccountExchange ae = new AccountExchange();
+     	ae.setAccount(account);
+     	ae.setOtherAccount(otherAccount);
+     	ae.setDirection(direction);
+     	ae.setStatus(Status.ACTIVE.value());
+     	em.persist(ae);
+     	return ae;
+     }
   } //endclass
   	

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core AccountDAOLocal.java, 1.16, 1.17

[John C. <jc...@us...>]

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

Modified Files:
	AccountDAOLocal.java 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

Index: AccountDAOLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/AccountDAOLocal.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AccountDAOLocal.java	8 Mar 2007 17:09:41 -0000	1.16
--- AccountDAOLocal.java	29 Mar 2007 07:46:01 -0000	1.17
***************
*** 20,23 ****
--- 20,24 ----
  import org.tolven.core.bean.ActivationBean;
  import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.AccountExchange;
  import org.tolven.core.entity.AccountType;
  import org.tolven.core.entity.AccountUser;
***************
*** 166,168 ****
--- 167,183 ----
           */
          public void setupAccountKeys(Account account, AccountUser accountUser, Invitation invitation, TolvenUser user);
+ 
+         /**
+          * For a given account, return all valid accounts which this account can talk to.
+          * @param account
+          * @param direction
+          * @param complete A boolean that when true indicates that both parties in the exchange are in agreement
+          * about the exchange. False means that the "other party" need not have agreed to the exchange. For example,
+          * if the account administrator wants to see a list of other accounts that one could 
+          * potentially. communicate with.
+          * @return
+          */
+         public List<AccountExchange> findActiveEndPoints( Account account, AccountExchange.Direction direction, boolean complete );
+         
+         public AccountExchange newAccountExchange( Account account, Account otherAccount, AccountExchange.Direction direction );
  }

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web AccountAction.java, 1.13, 1.14

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5817/src/org/tolven/web

Modified Files:
	AccountAction.java 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

Index: AccountAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AccountAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AccountAction.java	20 Mar 2007 09:13:43 -0000	1.13
--- AccountAction.java	29 Mar 2007 07:45:57 -0000	1.14
***************
*** 14,20 ****
--- 14,23 ----
  package org.tolven.web;
  
+ import java.util.Date;
  import java.util.List;
  
  import javax.annotation.EJB;
+ import javax.faces.application.FacesMessage;
+ import javax.faces.context.FacesContext;
  import javax.faces.model.DataModel;
  import javax.faces.model.ListDataModel;
***************
*** 22,26 ****
--- 25,32 ----
  import javax.naming.NamingException;
  
+ import org.tolven.core.AccountDAOLocal;
  import org.tolven.core.ActivationLocal;
+ import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.AccountExchange;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.TolvenUser;
***************
*** 31,38 ****
  
  	@EJB private ActivationLocal activation;
  
  	private AccountUser accountUser;
  	private DataModel accountUsersModel;
!     // Starting with next login, remember my selection this time
      private boolean rememberDefault;
  
--- 37,52 ----
  
  	@EJB private ActivationLocal activation;
+ 	@EJB private AccountDAOLocal accountBean;
  
  	private AccountUser accountUser;
  	private DataModel accountUsersModel;
! 	private List<AccountExchange> accountExchangeSend;
! 	private DataModel accountExchangeSendModel;
! 	private List<AccountExchange> accountExchangeReceive;
! 	private DataModel accountExchangeReceiveModel;
! 	private long sendAccountId;
! 	private long receiveAccountId;
! 
! 	// Starting with next login, remember my selection this time
      private boolean rememberDefault;
  
***************
*** 43,46 ****
--- 57,61 ----
             // I think this is a JBOSS-only scam.
             activation = (ActivationLocal) ctx.lookup("tolven/ActivationBean/local");
+            accountBean = (AccountDAOLocal) ctx.lookup("tolven/AccountDAOBean/local");
  	}
  
***************
*** 85,88 ****
--- 100,137 ----
  	}
  
+     /**
+      */
+ 	public List<AccountExchange> getAccountExchangeSend() {
+ 		if (accountExchangeSend==null) {
+             accountExchangeSend = accountBean.findActiveEndPoints(this.getAccountUser().getAccount(), AccountExchange.Direction.SEND, false);
+         }
+ 		return accountExchangeSend;
+ 	}
+ 
+ 	public DataModel getAccountExchangeSendModel() {
+ 		if (accountExchangeSendModel==null) {
+ 			accountExchangeSendModel = new ListDataModel();
+ 			accountExchangeSendModel.setWrappedData(getAccountExchangeSend());
+ 		}
+ 		return accountExchangeSendModel;
+ 	}
+ 
+     /**
+      */
+ 	public List<AccountExchange> getAccountExchangeReceive() {
+ 		if (accountExchangeReceive==null) {
+ 			accountExchangeReceive = accountBean.findActiveEndPoints(this.getAccountUser().getAccount(), AccountExchange.Direction.RECEIVE, false);
+         }
+ 		return accountExchangeReceive;
+ 	}
+ 
+ 	public DataModel getAccountExchangeReceiveModel() {
+ 		if (accountExchangeReceiveModel==null) {
+ 			accountExchangeReceiveModel = new ListDataModel();
+ 			accountExchangeReceiveModel.setWrappedData(getAccountExchangeReceive());
+ 		}
+ 		return accountExchangeReceiveModel;
+ 	}
+ 
  	public boolean isRememberDefault() {
  		return rememberDefault;
***************
*** 117,119 ****
--- 166,213 ----
  		return getAccountUsers().size();
  	}
+ 
+ 	public long getReceiveAccountId() {
+ 		return receiveAccountId;
+ 	}
+ 
+ 	public void setReceiveAccountId(long receiveAccountId) {
+ 		this.receiveAccountId = receiveAccountId;
+ 	}
+ 
+ 	public long getSendAccountId() {
+ 		return sendAccountId;
+ 	}
+ 
+ 	public void setSendAccountId(long sendAccountId) {
+ 		this.sendAccountId = sendAccountId;
+ 	}
+ 	
+ 	public String addSendAccount() {
+ 		System.out.println( "Adding account: " + getSendAccountId() );
+ 		Account otherAccount = accountBean.findAccount(getSendAccountId());
+ 		if (otherAccount==null) {
+ 			FacesContext.getCurrentInstance().addMessage("exchangeSend:sendAccount", new FacesMessage("Invalid Account"));
+ 			return "fail";
+ 		}
+ 		AccountExchange aes = accountBean.newAccountExchange(this.getAccountUser().getAccount(), otherAccount, AccountExchange.Direction.SEND);
+     	aes.setEffectiveTime(getNow());
+     	accountExchangeSend = null;
+     	accountExchangeSendModel = null;
+ 		return "success";
+ 	}
+ 
+ 	public String addReceiveAccount() {
+ 		System.out.println( "Adding account: " + getReceiveAccountId() );
+ 		Account otherAccount = accountBean.findAccount(getReceiveAccountId());
+ 		if (otherAccount==null) {
+ 			FacesContext.getCurrentInstance().addMessage("exchangeReceive:receiveAccount", new FacesMessage("Invalid Account"));
+ 			return "fail";
+ 		}
+ 		AccountExchange aer = accountBean.newAccountExchange(this.getAccountUser().getAccount(), otherAccount, AccountExchange.Direction.RECEIVE);
+     	aer.setEffectiveTime(getNow());
+     	accountExchangeReceive = null;
+     	accountExchangeReceiveModel = null;
+ 		return "success";
+ 	}
+ 
  }

[Tolven-cvs-commit] tolvenWEB/web/WEB-INF faces-config.xml, 1.44, 1.45

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5817/web/WEB-INF

Modified Files:
	faces-config.xml 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** faces-config.xml	27 Mar 2007 23:23:42 -0000	1.44
--- faces-config.xml	29 Mar 2007 07:45:57 -0000	1.45
***************
*** 161,164 ****
--- 161,174 ----
          </navigation-case>    	
  		<navigation-case>
+             <from-action>#{reg.addSendAccount}</from-action>
+             <from-outcome>success</from-outcome>
+             <to-view-id>/manage/editAccountProfile.xhtml</to-view-id>
+         </navigation-case>    	
+ 		<navigation-case>
+             <from-action>#{reg.addSendAccount}</from-action>
+             <from-outcome>fail</from-outcome>
+             <to-view-id>/manage/editAccountProfile.xhtml</to-view-id>
+         </navigation-case>    	
+ 		<navigation-case>
              <from-outcome>dispatch</from-outcome>
              <to-view-id>/private/dispatch.xhtml</to-view-id>

[Tolven-cvs-commit] tolvenWEB/web/manage accountExchange.xhtml, NONE, 1.1 editAccountProfile.xhtml, 1.3, 1.4

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/manage
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5817/web/manage

Modified Files:
	editAccountProfile.xhtml 
Added Files:
	accountExchange.xhtml 
Log Message:
Add new AccountExchange entity representing accounts allowed to send and accountsAllowed to receive from this account. The UI to maintain this table is under Preferences > Edit Account Profile (the UI functions are incomplete).

--- NEW FILE: accountExchange.xhtml ---

Index: editAccountProfile.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/manage/editAccountProfile.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** editAccountProfile.xhtml	25 Mar 2007 13:52:24 -0000	1.3
--- editAccountProfile.xhtml	29 Mar 2007 07:45:57 -0000	1.4
***************
*** 158,161 ****
--- 158,237 ----
  	        </h:form>
  
+            <h3>Account Exchange - Send</h3>
+ 	         <h:form id="exchangeSend" >       
+ 	         <p>A List of accounts you send patient data.</p>
+    		      <h:dataTable value="#{acc.accountExchangeSendModel}" var="aes" styleClass="activity">
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Id"/>
+ 	                </f:facet>
+ 	                <h:outputText value="#{aes.id}"/>
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Account"/>
+ 	                </f:facet>
+ 	                <h:outputText value="#{aes.otherAccount.id}" />
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Title"/>
+ 	                </f:facet>
+ 	                    <h:outputText value="#{aes.otherAccount.title}"/>
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Status"/>
+ 	                </f:facet>
+ 	                    <h:outputText value="TBD"/>
+ 	            </h:column>
+ 	          </h:dataTable>
+               <h:panelGrid columns="2" >
+ 	               <h:inputText id="sendAccount" value="#{acc.sendAccountId}">
+ 	               </h:inputText>
+     	           <h:commandButton action="#{acc.addSendAccount}" value="Add Account to send data to"/>
+               </h:panelGrid>
+        	      <h:messages for="exchangeSend:sendAccount" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
+    	           <h:outputText value=" | | " />
+ 			  <h:commandLink value="Return to Application" action="dispatch" immediate="true"/>
+ 	        </h:form>
+            <h3>Account Exchange - Receive</h3>
+ 	         <h:form id="exchangeReceive" >       
+ 	         <p>A List of accounts you recive patient data.</p>
+    		      <h:dataTable value="#{acc.accountExchangeReceiveModel}" var="aer" styleClass="activity">
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Id"/>
+ 	                </f:facet>
+ 	                <h:outputText value="#{aer.id}"/>
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Account"/>
+ 	                </f:facet>
+ 	                <h:outputText value="#{aer.otherAccount.id}" />
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Title"/>
+ 	                </f:facet>
+ 	                    <h:outputText value="#{aer.otherAccount.title}"/>
+ 	            </h:column>
+ 	            <h:column>
+ 	                <f:facet name="header">
+ 	                    <h:outputText value="Status"/>
+ 	                </f:facet>
+ 	                    <h:outputText value="TBD"/>
+ 	            </h:column>
+ 	          </h:dataTable>
+               <h:panelGrid columns="2" >
+ 	               <h:inputText id="receiveAccount" value="#{acc.receiveAccountId}">
+ 	               </h:inputText>
+     	           <h:commandButton action="#{acc.addReceiveAccount}" value="Add Account to receive data from"/>
+               </h:panelGrid>
+        	      <h:messages for="exchangeReceive:sendAccount" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/>
+    	           <h:outputText value=" | | " />
+ 			  <h:commandLink value="Return to Application" action="dispatch" immediate="true"/>
+ 	        </h:form>
  	      
        </ui:define>

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/trim TemplateId.java, NONE, 1.1 Application.java, NONE, 1.1 NewFacetLabel.java, 1.3, 1.4 RoleSlot.java, 1.4, 1.5 Participation.java, 1.4, 1.5 BinaryDataEncoding.java, 1.4, 1.5 EntityNamePartQualifier.java, 1.4, 1.5 EntityClass.java, 1.4, 1.5 ActParticipation.java, 1.4, 1.5 ED.java, 1.4, 1.5 CV.java, 1.4, 1.5 EntityStatus.java, 1.4, 1.5 RoleBind.java, 1.4, 1.5 GTS.java, 1.4, 1.5 EntityNamePartType.java, 1.4, 1.5 Observation.java, 1.4, 1.5 ObjectFactory.java, 1.4, 1.5 ParticipationSubset.java, 1.4, 1.5 CDSlot.java, 1.4, 1.5 RoleInternal.java, 1.4, 1.5 IVLINT.java, 1.4, 1.5 PostalAddressUse.java, 1.4, 1.5 TsBoundary.java, 1.4, 1.5 NullFlavor.java, 1.4, 1.5 ActMood.java, 1.4, 1.5 IntegrityCheckType.java, 1.4, 1.5 EntityNameUse.java, 1.4, 1.5 RoleReference.java, 1.4, 1.5 CD.java, 1.4, 1.5 NewFacetValidate.java, 1.3, 1.4 ActSlot.java, 1.4, 1.5 ActReference.java, 1.4, 1.5 DataType.java, 1.4, 1.5 ActInternal.java, 1.4, 1.5 ActRelationshipJoin.java, 1.4, 1.5 RoleLinkType.java, 1.4, 1.5 RealmCode.java, 1.4, 1.5 SetOperator.java, 1.4, 1.5 ParticipationSignature.java, 1.4, 1.5 GTSSlot.java, 1.4, 1.5 ActBind.java, 1.4, 1.5 OutboundActRelationship.java, 1.4, 1.5 NewFacetSet.java, 1.1, 1.2 IntegrityCheck.java, 1.4, 1.5 CESlot.java, 1.4, 1.5 AddressPartType.java, 1.4, 1.5 BL.java, 1.4, 1.5 InboundActRelationship.java, 1.4, 1.5 TELFieldType.java, 1.4, 1.5 ActRelationship.java, 1.4, 1.5 ConcreteDatatype.java, 1.3, 1.4 SETCESlot.java, 1.4, 1.5 RoleNull.java, 1.4, 1.5 ActRelationshipSubset.java, 1.4, 1.5 ActStatus.java, 1.4, 1.5 Slot.java, 1.4, 1.5 ActRelationshipCheckpoint.java, 1.4, 1.5 TimingEvent.java, 1.4, 1.5 CR.java, 1.4, 1.5 STSlot.java, 1.4, 1.5 package-info.java, 1.4, 1.5 Role.java, 1.4, 1.5 TSSlot.java, 1.4, 1.5 ActClass.java, 1.4, 1.5 PQ.java, 1.4, 1.5 NewFacetInput.java, 1.3, 1.4 CompressionAlgorithm.java, 1.4, 1.5 Act.java, 1.4, 1.5 IntegrityCheckAlgorithm.java, 1.4, 1.5 CE.java, 1.4, 1.5 ContextControl.java, 1.4, 1.5 ActRelationshipType.java, 1.4, 1.5 ST.java, 1.4, 1.5 ParticipationType.java, 1.4, 1.5 ActNull.java, 1.4, 1.5 NewFacet.java, 1.3, 1.4 RoleStatus.java, 1.4, 1.5 UpdateCode.java, 1.4, 1.5 EDSlot.java, 1.4, 1.5 II.java, 1.4, 1.5 URL.java, 1.4, 1.5 IVLTS.java, 1.4, 1.5 EntityDeterminer.java, 1.4, 1.5 RoleClass.java, 1.4, 1.5 BLSlot.java, 1.4, 1.5 ActStatusSlot.java, 1.4, 1.5 RelationshipConjunction.java, 1.4, 1.5 ObservationValueSlot.java, 1.4, 1.5 IVLINTSlot.java, 1.4, 1.5 RoleParticipation.java, 1.4, 1.5 SETIISlot.java, 1.4, 1.5 Trim.java, 1.4, 1.5 AddressUse.java, 1.4, 1.5 TelecommunicationAddressUse.java, 1.4, 1.5 ActRelationshipSplit.java, 1.4, 1.5

[John C. <jc...@us...>]

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

Modified Files:
	NewFacetLabel.java RoleSlot.java Participation.java 
	BinaryDataEncoding.java EntityNamePartQualifier.java 
	EntityClass.java ActParticipation.java ED.java CV.java 
	EntityStatus.java RoleBind.java GTS.java 
	EntityNamePartType.java Observation.java ObjectFactory.java 
	ParticipationSubset.java CDSlot.java RoleInternal.java 
	IVLINT.java PostalAddressUse.java TsBoundary.java 
	NullFlavor.java ActMood.java IntegrityCheckType.java 
	EntityNameUse.java RoleReference.java CD.java 
	NewFacetValidate.java ActSlot.java ActReference.java 
	DataType.java ActInternal.java ActRelationshipJoin.java 
	RoleLinkType.java RealmCode.java SetOperator.java 
	ParticipationSignature.java GTSSlot.java ActBind.java 
	OutboundActRelationship.java NewFacetSet.java 
	IntegrityCheck.java CESlot.java AddressPartType.java BL.java 
	InboundActRelationship.java TELFieldType.java 
	ActRelationship.java ConcreteDatatype.java SETCESlot.java 
	RoleNull.java ActRelationshipSubset.java ActStatus.java 
	Slot.java ActRelationshipCheckpoint.java TimingEvent.java 
	CR.java STSlot.java package-info.java Role.java TSSlot.java 
	ActClass.java PQ.java NewFacetInput.java 
	CompressionAlgorithm.java Act.java 
	IntegrityCheckAlgorithm.java CE.java ContextControl.java 
	ActRelationshipType.java ST.java ParticipationType.java 
	ActNull.java NewFacet.java RoleStatus.java UpdateCode.java 
	EDSlot.java II.java URL.java IVLTS.java EntityDeterminer.java 
	RoleClass.java BLSlot.java ActStatusSlot.java 
	RelationshipConjunction.java ObservationValueSlot.java 
	IVLINTSlot.java RoleParticipation.java SETIISlot.java 
	Trim.java AddressUse.java TelecommunicationAddressUse.java 
	ActRelationshipSplit.java 
Added Files:
	TemplateId.java Application.java 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: NewFacetSet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewFacetSet.java	27 Mar 2007 23:23:57 -0000	1.1
--- NewFacetSet.java	29 Mar 2007 01:00:45 -0000	1.2
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: EntityStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityStatus.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EntityStatus.java	27 Mar 2007 23:23:56 -0000	1.4
--- EntityStatus.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: BLSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BLSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BLSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- BLSlot.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActMood.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActMood.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActMood.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActMood.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: SetOperator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SetOperator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SetOperator.java	27 Mar 2007 23:23:57 -0000	1.4
--- SetOperator.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: EDSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EDSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EDSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- EDSlot.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: InboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/InboundActRelationship.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InboundActRelationship.java	27 Mar 2007 23:23:57 -0000	1.4
--- InboundActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: RelationshipConjunction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RelationshipConjunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RelationshipConjunction.java	27 Mar 2007 23:23:57 -0000	1.4
--- RelationshipConjunction.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: OutboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/OutboundActRelationship.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OutboundActRelationship.java	27 Mar 2007 23:23:57 -0000	1.4
--- OutboundActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActBind.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActBind.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActBind.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActBind.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  
***************
*** 9,14 ****
--- 9,17 ----
  package org.tolven.trim;
  
+ import java.util.ArrayList;
+ import java.util.List;
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
+ import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlType;
  
***************
*** 26,30 ****
   *         &lt;element name="classCode" type="{urn:tolven-org:trim:4.0}ActClass" minOccurs="0"/>
   *         &lt;element name="moodCode" type="{urn:tolven-org:trim:4.0}ActMood" minOccurs="0"/>
!  *         &lt;element name="templateId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
   *       &lt;/sequence>
   *     &lt;/extension>
--- 29,33 ----
   *         &lt;element name="classCode" type="{urn:tolven-org:trim:4.0}ActClass" minOccurs="0"/>
   *         &lt;element name="moodCode" type="{urn:tolven-org:trim:4.0}ActMood" minOccurs="0"/>
!  *         &lt;element name="templateId" type="{urn:tolven-org:trim:4.0}TemplateId" maxOccurs="unbounded" minOccurs="0"/>
   *       &lt;/sequence>
   *     &lt;/extension>
***************
*** 39,43 ****
      "classCode",
      "moodCode",
!     "templateId"
  })
  public class ActBind
--- 42,46 ----
      "classCode",
      "moodCode",
!     "templateIds"
  })
  public class ActBind
***************
*** 47,51 ****
      protected ActClass classCode;
      protected ActMood moodCode;
!     protected String templateId;
  
      /**
--- 50,55 ----
      protected ActClass classCode;
      protected ActMood moodCode;
!     @XmlElement(name = "templateId")
!     protected List<TemplateId> templateIds;
  
      /**
***************
*** 98,122 ****
  
      /**
!      * Gets the value of the templateId property.
       * 
-      * @return
-      *     possible object is
-      *     {@link String }
-      *     
-      */
-     public String getTemplateId() {
-         return templateId;
-     }
- 
-     /**
-      * Sets the value of the templateId property.
       * 
-      * @param value
-      *     allowed object is
-      *     {@link String }
-      *     
       */
!     public void setTemplateId(String value) {
!         this.templateId = value;
      }
  
--- 102,131 ----
  
      /**
!      * Gets the value of the templateIds property.
!      * 
!      * <p>
!      * This accessor method returns a reference to the live list,
!      * not a snapshot. Therefore any modification you make to the
!      * returned list will be present inside the JAXB object.
!      * This is why there is not a <CODE>set</CODE> method for the templateIds property.
!      * 
!      * <p>
!      * For example, to add a new item, do as follows:
!      * <pre>
!      *    getTemplateIds().add(newItem);
!      * </pre>
!      * 
!      * 
!      * <p>
!      * Objects of the following type(s) are allowed in the list
!      * {@link TemplateId }
       * 
       * 
       */
!     public List<TemplateId> getTemplateIds() {
!         if (templateIds == null) {
!             templateIds = new ArrayList<TemplateId>();
!         }
!         return this.templateIds;
      }
  

Index: EntityDeterminer.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityDeterminer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EntityDeterminer.java	27 Mar 2007 23:23:57 -0000	1.4
--- EntityDeterminer.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: IVLINT.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLINT.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IVLINT.java	27 Mar 2007 23:23:57 -0000	1.4
--- IVLINT.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: RoleParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleParticipation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RoleParticipation.java	27 Mar 2007 23:23:57 -0000	1.4
--- RoleParticipation.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: DataType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/DataType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DataType.java	27 Mar 2007 23:23:57 -0000	1.4
--- DataType.java	29 Mar 2007 01:00:44 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: EntityNamePartQualifier.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityNamePartQualifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EntityNamePartQualifier.java	27 Mar 2007 23:23:56 -0000	1.4
--- EntityNamePartQualifier.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: GTSSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/GTSSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GTSSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- GTSSlot.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: BinaryDataEncoding.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BinaryDataEncoding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BinaryDataEncoding.java	27 Mar 2007 23:23:56 -0000	1.4
--- BinaryDataEncoding.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: AddressPartType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressPartType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddressPartType.java	27 Mar 2007 23:23:57 -0000	1.4
--- AddressPartType.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActClass.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActClass.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActClass.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActClass.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ConcreteDatatype.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ConcreteDatatype.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConcreteDatatype.java	27 Mar 2007 23:23:57 -0000	1.3
--- ConcreteDatatype.java	29 Mar 2007 01:00:45 -0000	1.4
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActRelationshipJoin.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipJoin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActRelationshipJoin.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActRelationshipJoin.java	29 Mar 2007 01:00:44 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: NewFacet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewFacet.java	27 Mar 2007 23:23:57 -0000	1.3
--- NewFacet.java	29 Mar 2007 01:00:46 -0000	1.4
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: STSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/STSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** STSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- STSlot.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActRelationshipSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSubset.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActRelationshipSubset.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActRelationshipSubset.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActSlot.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatus.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActStatus.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActStatus.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActNull.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActNull.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActNull.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActNull.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActRelationshipType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActRelationshipType.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActRelationshipType.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: NullFlavor.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NullFlavor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NullFlavor.java	27 Mar 2007 23:23:57 -0000	1.4
--- NullFlavor.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: TelecommunicationAddressUse.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TelecommunicationAddressUse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TelecommunicationAddressUse.java	27 Mar 2007 23:23:57 -0000	1.4
--- TelecommunicationAddressUse.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: RoleSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RoleSlot.java	27 Mar 2007 23:23:56 -0000	1.4
--- RoleSlot.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ParticipationType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParticipationType.java	27 Mar 2007 23:23:57 -0000	1.4
--- ParticipationType.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: NewFacetInput.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetInput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewFacetInput.java	27 Mar 2007 23:23:57 -0000	1.3
--- NewFacetInput.java	29 Mar 2007 01:00:46 -0000	1.4
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: Observation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/Observation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Observation.java	27 Mar 2007 23:23:56 -0000	1.4
--- Observation.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: IntegrityCheckType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IntegrityCheckType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IntegrityCheckType.java	27 Mar 2007 23:23:57 -0000	1.4
--- IntegrityCheckType.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ParticipationSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationSubset.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ParticipationSubset.java	27 Mar 2007 23:23:56 -0000	1.4
--- ParticipationSubset.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: CD.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CD.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CD.java	27 Mar 2007 23:23:57 -0000	1.4
--- CD.java	29 Mar 2007 01:00:41 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActStatusSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatusSlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActStatusSlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActStatusSlot.java	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActRelationshipCheckpoint.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipCheckpoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActRelationshipCheckpoint.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActRelationshipCheckpoint.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActParticipation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActParticipation.java	27 Mar 2007 23:23:56 -0000	1.4
--- ActParticipation.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: SETCESlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SETCESlot.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SETCESlot.java	27 Mar 2007 23:23:57 -0000	1.4
--- SETCESlot.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ObjectFactory.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ObjectFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ObjectFactory.java	27 Mar 2007 23:23:56 -0000	1.4
--- ObjectFactory.java	29 Mar 2007 01:00:40 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  
***************
*** 38,142 ****
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheck }
       * 
       */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
      }
  
      /**
!      * Create an instance of {@link ST }
       * 
       */
!     public ST createST() {
!         return new ST();
      }
  
      /**
!      * Create an instance of {@link NewFacetLabel }
       * 
       */
!     public NewFacetLabel createNewFacetLabel() {
!         return new NewFacetLabel();
      }
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
      /**
!      * Create an instance of {@link ED }
       * 
       */
!     public ED createED() {
!         return new ED();
      }
  
      /**
!      * Create an instance of {@link Act }
       * 
       */
!     public Act createAct() {
!         return new Act();
      }
  
      /**
!      * Create an instance of {@link SETIISlot }
       * 
       */
!     public SETIISlot createSETIISlot() {
!         return new SETIISlot();
      }
  
      /**
!      * Create an instance of {@link InboundActRelationship }
       * 
       */
!     public InboundActRelationship createInboundActRelationship() {
!         return new InboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link TsBoundary }
       * 
       */
!     public TsBoundary createTsBoundary() {
!         return new TsBoundary();
      }
  
      /**
!      * Create an instance of {@link RoleBind }
       * 
       */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
--- 38,150 ----
  
      /**
!      * Create an instance of {@link BL }
       * 
       */
!     public BL createBL() {
!         return new BL();
      }
  
      /**
!      * Create an instance of {@link CR }
       * 
       */
!     public CR createCR() {
!         return new CR();
      }
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * Create an instance of {@link IVLTS }
       * 
       */
!     public IVLTS createIVLTS() {
!         return new IVLTS();
      }
  
      /**
!      * Create an instance of {@link CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD createCD() {
!         return new CD();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheck }
       * 
       */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
      }
  
      /**
!      * Create an instance of {@link TsBoundary }
       * 
       */
!     public TsBoundary createTsBoundary() {
!         return new TsBoundary();
      }
  
      /**
!      * Create an instance of {@link IVLINT }
       * 
       */
!     public IVLINT createIVLINT() {
!         return new IVLINT();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
!     }
! 
!     /**
!      * Create an instance of {@link CV }
!      * 
!      */
!     public CV createCV() {
!         return new CV();
      }
  
***************
*** 150,198 ****
  
      /**
!      * Create an instance of {@link IVLINT }
       * 
       */
!     public IVLINT createIVLINT() {
!         return new IVLINT();
      }
  
      /**
!      * Create an instance of {@link PQ }
       * 
       */
!     public PQ createPQ() {
!         return new PQ();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD createCD() {
!         return new CD();
      }
  
      /**
!      * Create an instance of {@link CR }
       * 
       */
!     public CR createCR() {
!         return new CR();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheckType }
       * 
       */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
      }
  
      /**
!      * Create an instance of {@link RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
--- 158,206 ----
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link RoleParticipation }
       * 
       */
!     public RoleParticipation createRoleParticipation() {
!         return new RoleParticipation();
      }
  
      /**
!      * Create an instance of {@link TemplateId }
       * 
       */
!     public TemplateId createTemplateId() {
!         return new TemplateId();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
      }
  
      /**
!      * Create an instance of {@link SETIISlot }
       * 
       */
!     public SETIISlot createSETIISlot() {
!         return new SETIISlot();
      }
  
***************
*** 206,438 ****
  
      /**
!      * Create an instance of {@link IVLTS }
       * 
       */
!     public IVLTS createIVLTS() {
!         return new IVLTS();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link ActNull }
       * 
       */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
      /**
!      * Create an instance of {@link BL }
       * 
       */
!     public BL createBL() {
!         return new BL();
      }
  
      /**
!      * Create an instance of {@link CV }
       * 
       */
!     public CV createCV() {
!         return new CV();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link NewFacetValidate }
       * 
       */
!     public NewFacetValidate createNewFacetValidate() {
!         return new NewFacetValidate();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
      }
  
      /**
!      * Create an instance of {@link CDSlot }
       * 
       */
!     public CDSlot createCDSlot() {
!         return new CDSlot();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
      }
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link RoleInternal }
       * 
       */
!     public RoleInternal createRoleInternal() {
!         return new RoleInternal();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
      /**
!      * Create an instance of {@link Observation }
       * 
       */
!     public Observation createObservation() {
!         return new Observation();
      }
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link NewFacetSet }
       * 
       */
!     public NewFacetSet createNewFacetSet() {
!         return new NewFacetSet();
      }
  
      /**
!      * Create an instance of {@link RoleParticipation }
       * 
       */
!     public RoleParticipation createRoleParticipation() {
!         return new RoleParticipation();
      }
  
--- 214,454 ----
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link ActNull }
       * 
       */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link PQ }
       * 
       */
!     public PQ createPQ() {
!         return new PQ();
      }
  
      /**
!      * Create an instance of {@link ST }
       * 
       */
!     public ST createST() {
!         return new ST();
      }
  
      /**
!      * Create an instance of {@link CDSlot }
       * 
       */
!     public CDSlot createCDSlot() {
!         return new CDSlot();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link InboundActRelationship }
       * 
       */
!     public InboundActRelationship createInboundActRelationship() {
!         return new InboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheckType }
       * 
       */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
      }
  
      /**
!      * Create an instance of {@link NewFacetSet }
       * 
       */
!     public NewFacetSet createNewFacetSet() {
!         return new NewFacetSet();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
      }
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link ED }
       * 
       */
!     public ED createED() {
!         return new ED();
      }
  
      /**
!      * Create an instance of {@link NewFacetLabel }
       * 
       */
!     public NewFacetLabel createNewFacetLabel() {
!         return new NewFacetLabel();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link RoleBind }
       * 
       */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
      /**
!      * Create an instance of {@link Observation }
       * 
       */
!     public Observation createObservation() {
!         return new Observation();
      }
  
      /**
!      * Create an instance of {@link RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
      /**
!      * Create an instance of {@link NewFacetValidate }
       * 
       */
!     public NewFacetValidate createNewFacetValidate() {
!         return new NewFacetValidate();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link RoleInternal }
       * 
       */
!     public RoleInternal createRoleInternal() {
!         return new RoleInternal();
      }
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link Act }
       * 
       */
!     public Act createAct() {
!         return new Act();
!     }
! 
!     /**
!      * Create an instance of {@link Application }
!      * 
!      */
!     public Application createApplication() {
!         return new Application();
      }
  

Index: NewFacetValidate.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NewFacetValidate.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewFacetValidate.java	27 Mar 2007 23:23:57 -0000	1.3
--- NewFacetValidate.java	29 Mar 2007 01:00:41 -0000	1.4
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: CompressionAlgorithm.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CompressionAlgorithm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompressionAlgorithm.java	27 Mar 2007 23:23:57 -0000	1.4
--- CompressionAlgorithm.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: PQ.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/PQ.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PQ.java	27 Mar 2007 23:23:57 -0000	1.4
--- PQ.java	29 Mar 2007 01:00:46 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.24 at 06:32:20 PM PDT 
  //
  
--- 3,7 ----
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this file will be lost upon recompilation of the source schema. 
! // Generated on: 2007.03.28 at 05:41:27 PM PDT 
  //
  

Index: ActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationship.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActRelationship.java	27 Mar 2007 23:23:57 -0000	1.4
--- ActRelationship.java	29 Mar 2007 01:00:45 -0000	1.5
***************
*** 3,7 ****
  // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
  // Any modifications to this ...
 
[truncated message content]

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/bean CreatorBean.java, 1.7, 1.8 MenuBean.java, 1.52, 1.53 TrimBean.java, 1.2, 1.3

[John C. <jc...@us...>]

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

Modified Files:
	CreatorBean.java MenuBean.java TrimBean.java 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: MenuBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** MenuBean.java	27 Mar 2007 23:23:58 -0000	1.52
--- MenuBean.java	29 Mar 2007 01:00:47 -0000	1.53
***************
*** 646,650 ****
  		
  				MenuStructure obsSummary = new MenuStructure(
! 						account, summary,    "obsSummary.xhtml",   null,        7, "obssum",  "Observations",  "true", root.getPath() + ":patient:doc:obs:list", "portlet" );
  				em.persist( obsSummary );
  		
--- 646,650 ----
  		
  				MenuStructure obsSummary = new MenuStructure(
! 						account, summary,    "obsSummary.xhtml",   null,        7, "obssum",  "Observations",  "true", root.getPath() + ":patient:doc:obs:values", "portlet" );
  				em.persist( obsSummary );
  		

Index: CreatorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CreatorBean.java	20 Mar 2007 09:13:12 -0000	1.7
--- CreatorBean.java	29 Mar 2007 01:00:47 -0000	1.8
***************
*** 40,43 ****
--- 40,44 ----
  import org.tolven.trim.ActParticipation;
  import org.tolven.trim.ActSlot;
+ import org.tolven.trim.Application;
  import org.tolven.trim.InboundActRelationship;
  import org.tolven.trim.OutboundActRelationship;
***************
*** 47,50 ****
--- 48,52 ----
  import org.tolven.trim.RoleParticipation;
  import org.tolven.trim.RoleSlot;
+ import org.tolven.trim.TemplateId;
  import org.tolven.trim.Trim;
  import org.tolven.trim.util.TRIMException;
***************
*** 83,132 ****
  	 * Run throught the TRIM structure and replace bind requests with an internal ID where possible.
  	 */
! 	public void scanTrim( Trim trim, List<MenuPath> context ) {
  		ActSlot actSlot = trim.getAct();
  		if (actSlot instanceof Act ) {
! 			scanAct( (Act) actSlot, context );
  		}
  	}
  
! 	public void scanAct( Act act, List<MenuPath> context ) {
  		
  		for (ActParticipation part : act.getParticipations()) {
  			if (part.getRole() instanceof Role) {
! 				scanRole( (Role)part.getRole(), context );
  			} else if (part.getRole() instanceof RoleBind) { 
! 				part.setRole(bindRole( (RoleBind)part.getRole(), context ));
  			}
  		}
  		for (InboundActRelationship arInbound : act.getInboundActRelationships()) {
  			if ( arInbound.getTarget() instanceof Act) {
! 				scanAct( (Act) arInbound.getTarget(), context );
  			} else if ( arInbound.getTarget() instanceof ActBind) {
! 				arInbound.setTarget(bindAct( (ActBind)arInbound.getTarget(), context ));
  			}
  		}
  		for (OutboundActRelationship arOutbound : act.getOutboundActRelationships()) {
  			if ( arOutbound.getSource() instanceof Act) {
! 				scanAct( (Act) arOutbound.getSource(), context );
  			} else if ( arOutbound.getSource() instanceof ActBind) {
! 				arOutbound.setSource(bindAct( (ActBind)arOutbound.getSource(), context ));
  			}
  		}
  	}
  
! 	public void scanRole( Role role, List<MenuPath> context ) {
  		for ( RoleParticipation part : role.getParticipations()) {
  			if (part.getAct() instanceof Act) {
! 				scanAct( (Act)part.getAct(), context );
  			} else if (part.getAct() instanceof ActBind) { 
! 				part.setAct(bindAct( (ActBind)part.getAct(), context ));
  			}
  		}
  	}
  
! 	public static String matchContext( String templateId, List<MenuPath> context) {
  		for (MenuPath item : context ) {
! 			if (item.getPath().startsWith(templateId)) {
! 				MenuPath newPath = new MenuPath( templateId, item);
  				return newPath.getPathString();
  			}
--- 85,134 ----
  	 * Run throught the TRIM structure and replace bind requests with an internal ID where possible.
  	 */
! 	public void scanTrim( MenuStructure ms, Trim trim, List<MenuPath> context ) {
  		ActSlot actSlot = trim.getAct();
  		if (actSlot instanceof Act ) {
! 			scanAct( ms, (Act) actSlot, context );
  		}
  	}
  
! 	public void scanAct( MenuStructure ms, Act act, List<MenuPath> context ) {
  		
  		for (ActParticipation part : act.getParticipations()) {
  			if (part.getRole() instanceof Role) {
! 				scanRole( ms, (Role)part.getRole(), context );
  			} else if (part.getRole() instanceof RoleBind) { 
! 				part.setRole(bindRole( ms, (RoleBind)part.getRole(), context ));
  			}
  		}
  		for (InboundActRelationship arInbound : act.getInboundActRelationships()) {
  			if ( arInbound.getTarget() instanceof Act) {
! 				scanAct( ms, (Act) arInbound.getTarget(), context );
  			} else if ( arInbound.getTarget() instanceof ActBind) {
! 				arInbound.setTarget(bindAct( ms, (ActBind)arInbound.getTarget(), context ));
  			}
  		}
  		for (OutboundActRelationship arOutbound : act.getOutboundActRelationships()) {
  			if ( arOutbound.getSource() instanceof Act) {
! 				scanAct( ms, (Act) arOutbound.getSource(), context );
  			} else if ( arOutbound.getSource() instanceof ActBind) {
! 				arOutbound.setSource(bindAct( ms, (ActBind)arOutbound.getSource(), context ));
  			}
  		}
  	}
  
! 	public void scanRole( MenuStructure ms, Role role, List<MenuPath> context ) {
  		for ( RoleParticipation part : role.getParticipations()) {
  			if (part.getAct() instanceof Act) {
! 				scanAct( ms, (Act)part.getAct(), context );
  			} else if (part.getAct() instanceof ActBind) { 
! 				part.setAct(bindAct( ms, (ActBind)part.getAct(), context ));
  			}
  		}
  	}
  
! 	public static String matchContext( MenuStructure ms, TemplateId templateId, List<MenuPath> context) {
  		for (MenuPath item : context ) {
! 			if (item.getPath().startsWith(templateId.getValue())) {
! 				MenuPath newPath = new MenuPath( templateId.getValue(), item);
  				return newPath.getPathString();
  			}
***************
*** 141,147 ****
  	 * @return
  	 */
! 	public ActSlot bindAct( ActBind actBind, List<MenuPath> context ) {
  		if (null==context) return actBind;
! 		String mdPath = matchContext( actBind.getTemplateId(), context);
  		if (null==mdPath) return actBind;
  		ActInternal actInternal = factory.createActInternal(actBind.getClassCode(), actBind.getMoodCode(), mdPath);
--- 143,156 ----
  	 * @return
  	 */
! 	public ActSlot bindAct( MenuStructure ms, ActBind actBind, List<MenuPath> context ) {
  		if (null==context) return actBind;
! 		String mdPath = null;
! 		String knownType = ms.getAccount().getAccountType().getKnownType();
! 		for ( TemplateId templateId : actBind.getTemplateIds()) {
! 			if (knownType.equals(templateId.getApplication())) {
! 				mdPath = matchContext( ms, templateId, context);
! 				break;
! 			}
! 		}
  		if (null==mdPath) return actBind;
  		ActInternal actInternal = factory.createActInternal(actBind.getClassCode(), actBind.getMoodCode(), mdPath);
***************
*** 155,161 ****
  	 * @return
  	 */
! 	public RoleSlot bindRole( RoleBind roleBind, List<MenuPath> context ) {
  		if (null==context) return roleBind;
! 		String mdPath = matchContext( roleBind.getTemplateId(), context);
  		if (null==mdPath) return roleBind;
  		RoleInternal roleInternal = factory.createRoleInternal(roleBind.getClassCode(), mdPath);
--- 164,177 ----
  	 * @return
  	 */
! 	public RoleSlot bindRole( MenuStructure ms, RoleBind roleBind, List<MenuPath> context ) {
  		if (null==context) return roleBind;
! 		String mdPath = null;
! 		String knownType = ms.getAccount().getAccountType().getKnownType();
! 		for ( TemplateId templateId : roleBind.getTemplateIds()) {
! 			if (knownType.equals(templateId.getApplication())) {
! 				mdPath = matchContext( ms, templateId, context);
! 				break;
! 			}
! 		}
  		if (null==mdPath) return roleBind;
  		RoleInternal roleInternal = factory.createRoleInternal(roleBind.getClassCode(), mdPath);
***************
*** 183,187 ****
  		ByteArrayInputStream bs = new ByteArrayInputStream(ms.getTrim() );
  		Trim trim = (Trim) xmlBean.unmarshal(TRIM_NS, bs);
! 		scanTrim( trim, context);
  		// OK, now put the finished TRIM back into XML and store in the document.
  		ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ;
--- 199,203 ----
  		ByteArrayInputStream bs = new ByteArrayInputStream(ms.getTrim() );
  		Trim trim = (Trim) xmlBean.unmarshal(TRIM_NS, bs);
! 		scanTrim( ms, trim, context);
  		// OK, now put the finished TRIM back into XML and store in the document.
  		ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ;
***************
*** 225,230 ****
  		ByteArrayInputStream bs = new ByteArrayInputStream(mdTrim.getTrimHeader().getTrim() );
  		Trim trim = (Trim) xmlBean.unmarshal(TRIM_NS, bs);
! 		// Trim tells us where to instantiate this template. eg: ephr:patient:observation
! 		MenuStructure msInstance = menuBean.findMenuStructure(accountId, trim.getInstance());
  		TolvenUser user = activationBean.findUser(ejbContext.getCallerPrincipal().getName());
  		DocXML docXML = documentBean.createXMLDocument( TRIM_NS, user.getId(), msInstance.getAccount().getId() );
--- 241,262 ----
  		ByteArrayInputStream bs = new ByteArrayInputStream(mdTrim.getTrimHeader().getTrim() );
  		Trim trim = (Trim) xmlBean.unmarshal(TRIM_NS, bs);
! 		String knownType = mdTrim.getAccount().getAccountType().getKnownType();
! 		String instancePath = null;
! 		Application application = null;
! 		// Find the application section
! 		for ( Application app : trim.getApplications()) {
! 			if (knownType.equals(app.getName())) {
! 				application = app;
! 				break;
! 			}
! 		}
! 		if (application!=null) {
! 			instancePath = application.getInstance();
! 		} else {
! 			// Deprecated
! 			instancePath = trim.getInstance();
! 		}
! 		// InstancePath tells us where to instantiate this template. eg: ephr:patient:observation
! 		MenuStructure msInstance = menuBean.findMenuStructure(accountId, instancePath);
  		TolvenUser user = activationBean.findUser(ejbContext.getCallerPrincipal().getName());
  		DocXML docXML = documentBean.createXMLDocument( TRIM_NS, user.getId(), msInstance.getAccount().getId() );
***************
*** 233,237 ****
  		List<MenuPath> contextList = new ArrayList<MenuPath>();
  		contextList.add(new MenuPath(context));
! 		scanTrim( trim, contextList);
  //		trim.setDocumentId( docXML.getId());
  		// OK, now put the finished TRIM back into XML and store in the document.
--- 265,269 ----
  		List<MenuPath> contextList = new ArrayList<MenuPath>();
  		contextList.add(new MenuPath(context));
! 		scanTrim( msInstance, trim, contextList);
  //		trim.setDocumentId( docXML.getId());
  		// OK, now put the finished TRIM back into XML and store in the document.
***************
*** 272,288 ****
  		md.setDocumentId(docXML.getId());
  		menuBean.persistMenuData(md);
! 
! 		// Add item to the to do list as well.
! 		MenuStructure msToDo = menuBean.findMenuStructure(accountId, "ephr:activity:all");
! 		MenuData mdToDo = new MenuData( );
! 		mdToDo.setMenuStructure(msToDo);
! 		mdToDo.setReference(md);
! 		mdToDo.setDate01(md.getDate01());
! 		mdToDo.setString01(md.getParent01().getString02() + " " + md.getParent01().getString01());
! //		mdToDo.setParent01(md.getParent01());
! 		mdToDo.setString02("Unfinished " + md.getString01());
! 		mdToDo.setString03(ejbContext.getCallerPrincipal().getName());
! 		mdToDo.setDocumentId(docXML.getId());
! 		menuBean.persistMenuData(mdToDo);
  		return md;
  	}
--- 304,323 ----
  		md.setDocumentId(docXML.getId());
  		menuBean.persistMenuData(md);
! 		
! 		// See if we're asked to add this to WIP, do so.
! 		if (application!=null && application.getWip()!=null) {
! 			// Add item to the to do list as well.
! 			MenuStructure msToDo = menuBean.findMenuStructure(accountId, application.getWip());
! 			MenuData mdToDo = new MenuData( );
! 			mdToDo.setMenuStructure(msToDo);
! 			mdToDo.setReference(md);
! 			mdToDo.setDate01(md.getDate01());
! 			mdToDo.setString01(md.getParent01().getString02() + " " + md.getParent01().getString01());
! 	//		mdToDo.setParent01(md.getParent01());
! 			mdToDo.setString02("Unfinished " + md.getString01());
! 			mdToDo.setString03(ejbContext.getCallerPrincipal().getName());
! 			mdToDo.setDocumentId(docXML.getId());
! 			menuBean.persistMenuData(mdToDo);
! 		}
  		return md;
  	}

Index: TrimBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/TrimBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrimBean.java	12 Mar 2007 08:47:12 -0000	1.2
--- TrimBean.java	29 Mar 2007 01:00:47 -0000	1.3
***************
*** 32,35 ****
--- 32,36 ----
  import org.tolven.core.entity.Status;
  import org.tolven.doc.XMLLocal;
+ import org.tolven.trim.Application;
  import org.tolven.trim.Trim;
  
***************
*** 117,128 ****
  			em.merge( trimHeader );
  		}
  		// Persist the header
  		// Now see where this TRIM item should appear in menus, if anywhere.
  		// Notice that this list is not qualified by patient or account. 
! 		for ( String menuPath : trim.getMenus()) {
! 			TrimMenu trimMenu = new TrimMenu( );
! 			trimMenu.setTrimHeader(trimHeader);
! 			trimMenu.setMenuPath(menuPath);
! 			em.persist(trimMenu);
  		}
  	}
--- 118,132 ----
  			em.merge( trimHeader );
  		}
+ 
  		// Persist the header
  		// Now see where this TRIM item should appear in menus, if anywhere.
  		// Notice that this list is not qualified by patient or account. 
! 		for (Application application : trim.getApplications()) {
! 			for ( String menuPath : application.getMenus()) {
! 				TrimMenu trimMenu = new TrimMenu( );
! 				trimMenu.setTrimHeader(trimHeader);
! 				trimMenu.setMenuPath(menuPath);
! 				em.persist(trimMenu);
! 			}
  		}
  	}

[Tolven-cvs-commit] tolvenEJB/resources/rules echr.drl,1.2,1.3

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/resources/rules
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31195/resources/rules

Modified Files:
	echr.drl 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: echr.drl
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/echr.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** echr.drl	7 Feb 2007 01:37:51 -0000	1.2
--- echr.drl	29 Mar 2007 01:00:47 -0000	1.3
***************
*** 10,33 ****
  global org.tolven.app.bean.AppEvalAdaptor app;
  
- rule "Document rule"
- 	when
- 		$doc: DocXML()
- 	then
- 		// to start, remove all menudata associated with this document
- 		// We'll decide where it should go in these rule now that the document is submitted.
- 		app.removeReferencingMenuData( $doc );
- end
- 
  /**
   * See what we can do with a TRIM object
   */
! rule "trim"
  	when
  		$trim: Trim()
  	then
! 		for (ActSlot act : $trim.getActs()) assert( act );
  end
  
! rule "act rule"
  	when
  		$act: Act( $id : id, $effectiveTime : effectiveTime )
--- 10,24 ----
  global org.tolven.app.bean.AppEvalAdaptor app;
  
  /**
   * See what we can do with a TRIM object
   */
! rule "Exract act from trim"
  	when
  		$trim: Trim()
  	then
! 		assert( $trim.getAct() );
  end
  
! rule "Extract participation from act"
  	when
  		$act: Act( $id : id, $effectiveTime : effectiveTime )
***************
*** 38,42 ****
  			assert ( part );
  		}
- 		System.out.println( "Act: " + $act ); 
  end
  
--- 29,32 ----
***************
*** 46,63 ****
   * a single facts since we manage facts by equality (not identity).
   */
! rule "subject rule"
  	when
  		$subject: ActParticipation( typeCode == ParticipationType.SBJ )
  	then
  		assert( $subject.getRole() );
! 		System.out.println( "Got a subject" ); 
  end
  
  /**
   * If we get a pointer to a patient, and there's metadata that cares about patient, 
!  * lookup the patient explicitly. We then bind to the menuData
   * thereafter.
   */
! rule "Patient rule"
  	when
  		$pat: RoleInternal( classCode == RoleClass.PAT, $internalId : internalId )
--- 36,60 ----
   * a single facts since we manage facts by equality (not identity).
   */
! rule "Extract subject from participation"
  	when
  		$subject: ActParticipation( typeCode == ParticipationType.SBJ )
  	then
  		assert( $subject.getRole() );
! 		System.out.println( "Got a subject: " + $subject.getRole() ); 
! end
! 
! rule "Patient Placeholder"
! 	when
! 		$ms: MenuStructure( role == "placeholder", path == "echr:patient" )
! 	then
! 		System.out.println( "Got a patient Placeholder"  ); 
  end
  
  /**
   * If we get a pointer to a patient, and there's metadata that cares about patient, 
!  * lookup the patient explicitly. We can then bind to the menuData
   * thereafter.
   */
! rule "Match existing Patient"
  	when
  		$pat: RoleInternal( classCode == RoleClass.PAT, $internalId : internalId )
***************
*** 65,72 ****
  	then
  		assert( app.findMenuData( $ms, $internalId ) );
! 		System.out.println( "Got a patient id" + $internalId ); 
  end
  
  /**
   * Really just to prove that we got the menuData item
   */
--- 62,122 ----
  	then
  		assert( app.findMenuData( $ms, $internalId ) );
! 		System.out.println( "Got a patient: " + $internalId ); 
  end
  
  /**
+  * If we have an Observation Act in Event mood, and a patient, then we create
+  * a placeholder in MenuData from which other interested lists can reference.
+  * In the application, it is the placeholder that holds the full (encrypted) content
+  * that the user can drill down to in order to display details.
+  */
+ rule "Create observation placeholder"
+ 	when
+ 		$msPat: MenuStructure( role == "placeholder", path == "echr:patient" )
+ 		$mdPat: MenuData( menuStructure == $msPat, $patName : string01 )
+ 		$act: Act( moodCode == ActMood.EVN, classCode == ActClass.OBS )
+ 	then
+ 		System.out.println( "Create observation placeholder for " + $patName); 
+ 		MenuData mdObs = app.createPlaceholder($act, "echr:patient:observation", $mdPat);
+ 		mdObs.setPqValue01($act.getObservation().getValue().getPQS().get(0).getValue());
+ 		mdObs.setPqStringVal01( Double.toString( mdObs.getPqValue01()) );
+ 		mdObs.setPqUnits01($act.getObservation().getValue().getPQS().get(0).getUnit());
+ 		System.out.println( "[echr.drl]EffectiveTime " + $act.getEffectiveTime()); 
+ 		mdObs.setDate01($act.getEffectiveTime());
+ 		assert( mdObs );
+ end
+ 
+ /**
+  * If we find a (new) observation placeholder, we'll want to add it to the observation list. 
+  */
+ rule "Place observation on observation list"
+ 	when
+ 		$msObservation: MenuStructure( role == "placeholder", path == "echr:patient:observation" )
+ 		$mdObservation: MenuData( menuStructure == $msObservation, $mdPat: parent01 )
+ 	then
+ 		System.out.println( "Place observation on obs list"); 
+ 		// Add act to patient's observation list
+ 		MenuData mdObsList = app.createReferenceMD( $mdObservation, "echr:patient:doc:obs:values", $mdPat );
+ end
+ 
+ /**
+  * If we find a (new) observation placeholder, we'll want to add it to the observation summary. 
+  */
+ rule "Place observation on observation summary list"
+ 	when
+ 		$msObservation: MenuStructure( role == "placeholder", path == "echr:patient:observation" )
+ 		$mdObservation: MenuData( menuStructure == $msObservation, $mdPat: parent01 )
+ 	then
+ 		System.out.println( "Place observation on obs summary"); 
+ 		// Add act to patient's observation list
+ 		MenuData mdObsList = app.createReferenceMD( $mdObservation, "echr:patient:summary:obssum", $mdPat );
+ end
+ 
+ /**
+  * The following rules have no side effects - they just display trace messages.
+  * But may be useful as a starting point for additional rules.
+  */
+ 
+ /**
   * Really just to prove that we got the menuData item
   */
***************
*** 93,103 ****
  end
  
- rule "act is event observation rule"
- 	when
- 		$act: Act( moodCode == ActMood.EVN, classCode == ActClass.OBS )
- 	then
- 		System.out.println( "Act: " + $act + " is an observation event" ); 
- end
- 
  rule "Display ID slot"
  	when
--- 143,146 ----
***************
*** 121,124 ****
--- 164,168 ----
  end
  
+ /* Simple rule that displays all placeholders we know about
  rule "Display MS placeholders"
  	when
***************
*** 127,130 ****
--- 171,175 ----
  		System.out.println( "Placeholder: " + $ms.getPath( ));
  end
+ */
  
  /* Not a very interesting rule right now

[Tolven-cvs-commit] tolvenEJB/resources/trim weight.trim,1.2,1.3

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/resources/trim
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31195/resources/trim

Modified Files:
	weight.trim 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: weight.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/weight.trim,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** weight.trim	12 Mar 2007 08:47:12 -0000	1.2
--- weight.trim	29 Mar 2007 01:00:47 -0000	1.3
***************
*** 6,11 ****
  	<page>weight.xhtml</page>
  	<instance>ephr:patient:observation</instance>
! 	<menu>ephr:obsMenu</menu>
! 	<menu>echr:obsMenu</menu>
  	<act xsi:type="Act">
  			<!--templateId>urn:wikihit-org:PATIENT-ACT:0</templateId-->
--- 6,19 ----
  	<page>weight.xhtml</page>
  	<instance>ephr:patient:observation</instance>
! 	<application name="ephr">
! 		<instance>ephr:patient:observation</instance>
! 		<wip>ephr:activity:all</wip>
! 		<menu>ephr:obsMenu</menu>
! 	</application>
! 	<application name="echr">
! 		<instance>echr:patient:observation</instance>
! 		<wip>echr:activity:all</wip>
! 		<menu>echr:obsMenu</menu>
! 	</application>
  	<act xsi:type="Act">
  			<!--templateId>urn:wikihit-org:PATIENT-ACT:0</templateId-->
***************
*** 13,19 ****
  			<moodCode>EVN</moodCode>
  			<id>
- 				<xxx>a</xxx>
- 				<II extension="abc"/>
- 				<II extension="abc"/>
  				<II extension="abc"/>
  			</id>
--- 21,24 ----
***************
*** 52,56 ****
  			<role xsi:type="RoleBind">
  				<classCode>PAT</classCode>
! 				<templateId>ephr:patient</templateId>
  			</role>
  		</participation>
--- 57,62 ----
  			<role xsi:type="RoleBind">
  				<classCode>PAT</classCode>
! 				<templateId application="ephr">ephr:patient</templateId>
! 				<templateId application="echr">echr:patient</templateId>
  			</role>
  		</participation>

[Tolven-cvs-commit] tolvenEJB/resources/xsd trim4.xsd,1.4,1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenEJB/resources/xsd
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31195/resources/xsd

Modified Files:
	trim4.xsd 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: trim4.xsd
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** trim4.xsd	27 Mar 2007 23:23:58 -0000	1.4
--- trim4.xsd	29 Mar 2007 01:00:47 -0000	1.5
***************
*** 16,22 ****
--- 16,31 ----
  			<xs:element name="element" type="xs:string"/>
  			<xs:element name="menu" type="xs:string" maxOccurs="unbounded"/>
+ 			<xs:element name="application" type="Application" maxOccurs="unbounded"/>
  			<xs:element name="act" type="ActSlot"/>
  		</xs:sequence>
  	</xs:complexType>
+ 	<xs:complexType name="Application" >
+ 		<xs:sequence>
+ 			<xs:element name="instance" type="xs:string" maxOccurs="1"/>
+ 			<xs:element name="wip" type="xs:string" maxOccurs="1"/>
+ 			<xs:element name="menu" type="xs:string" maxOccurs="unbounded"/>
+ 		</xs:sequence>
+ 		<xs:attribute name="name" type="xs:Name"/>
+ 	</xs:complexType>
  	<!--xs:complexType name="InfrastructureRoot" abstract="true">
  		<xs:sequence>
***************
*** 66,74 ****
  					<xs:element name="classCode" type="ActClass" minOccurs="0"/>
  					<xs:element name="moodCode" type="ActMood" minOccurs="0"/>
! 					<xs:element name="templateId" type="xs:string" minOccurs="0"/>
  				</xs:sequence>
  			</xs:extension>
  		</xs:complexContent>
  	</xs:complexType>
  	<xs:complexType name="Act">
  		<xs:complexContent>
--- 75,90 ----
  					<xs:element name="classCode" type="ActClass" minOccurs="0"/>
  					<xs:element name="moodCode" type="ActMood" minOccurs="0"/>
! 					<xs:element name="templateId" type="TemplateId" minOccurs="0" maxOccurs="unbounded"/>
  				</xs:sequence>
  			</xs:extension>
  		</xs:complexContent>
  	</xs:complexType>
+ 	<xs:complexType name="TemplateId">
+ 		<xs:simpleContent>
+ 			<xs:extension base="st">
+ 				<xs:attribute name="application" type="xs:string"/>
+ 			</xs:extension>
+ 		</xs:simpleContent>
+ 	</xs:complexType>
  	<xs:complexType name="Act">
  		<xs:complexContent>
***************
*** 223,227 ****
  				<xs:sequence>
  					<xs:element name="classCode" type="RoleClass" minOccurs="0"/>
! 					<xs:element name="templateId" type="xs:string" minOccurs="0"/>
  				</xs:sequence>
  			</xs:extension>
--- 239,243 ----
  				<xs:sequence>
  					<xs:element name="classCode" type="RoleClass" minOccurs="0"/>
! 					<xs:element name="templateId" type="TemplateId" minOccurs="0" maxOccurs="unbounded"/>
  				</xs:sequence>
  			</xs:extension>

[Tolven-cvs-commit] tolvenWEB/web/five login.xhtml,1.12,1.13

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/web/five
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31175/web/five

Modified Files:
	login.xhtml 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: login.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/login.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** login.xhtml	24 Mar 2007 15:27:26 -0000	1.12
--- login.xhtml	29 Mar 2007 01:00:27 -0000	1.13
***************
*** 38,42 ****
  			</div>
  			<div style="padding:10px;margin:5px;width:600px;clear:both">
! <p><strong>Update:  February 24, 2007</strong></p>
  <p>Tolven is providing &ldquo;open access&rdquo; to this implementation of its open source healthcare solutions, which are available   for download under the Lesser   General Public License from <a title="http://sourceforge.net/projects/tolven" href="http://sourceforge.net/projects/tolven">http://sourceforge.net/projects/tolven</a>.   The purpose of this demonstration system is to enable individuals, organizations   and academic institutes to review the usability, system performance and example   functionality that the Tolven electronic Personal Health Record and electronic Clinician Health Record without the need to install the software   locally.</p>
  <p>Instructions for using the demonstration system and for installing and using the Palm Treo 680 smartphone   version of the solution can be found at <a title="http://tolven.org/downloads.html" href="http://tolven.org/downloads.html">http://tolven.org/downloads.html</a>. </p>
--- 38,42 ----
  			</div>
  			<div style="padding:10px;margin:5px;width:600px;clear:both">
! <p><strong>Update:  March 27, 2007</strong></p>
  <p>Tolven is providing &ldquo;open access&rdquo; to this implementation of its open source healthcare solutions, which are available   for download under the Lesser   General Public License from <a title="http://sourceforge.net/projects/tolven" href="http://sourceforge.net/projects/tolven">http://sourceforge.net/projects/tolven</a>.   The purpose of this demonstration system is to enable individuals, organizations   and academic institutes to review the usability, system performance and example   functionality that the Tolven electronic Personal Health Record and electronic Clinician Health Record without the need to install the software   locally.</p>
  <p>Instructions for using the demonstration system and for installing and using the Palm Treo 680 smartphone   version of the solution can be found at <a title="http://tolven.org/downloads.html" href="http://tolven.org/downloads.html">http://tolven.org/downloads.html</a>. </p>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web TRIMAction.java, 1.4, 1.5

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31175/src/org/tolven/web

Modified Files:
	TRIMAction.java 
Log Message:
Changes to get eCHR data entry working. Still limited to weight.

Index: TRIMAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TRIMAction.java	27 Mar 2007 23:23:42 -0000	1.4
--- TRIMAction.java	29 Mar 2007 01:00:28 -0000	1.5
***************
*** 53,56 ****
--- 53,59 ----
  	public String upload( ) throws Exception {
  		MenuData md = getMenuDataItem();
+ 		if (md==null) {
+ 			throw new RuntimeException( "upload requested but no menuDataItem specified");
+ 		}
  		DocBase doc = documentLocal.findDocument(md.getDocumentId());
  		if (doc==null) {

[Tolven-cvs-commit] tolvenWEB build.xml,1.9,1.9.8.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenWEB
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20768

Modified Files:
      Tag: E_JI_MDBKeys
	build.xml 
Log Message:
First stage of having queues encrypted for particular accounts

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/build.xml,v
retrieving revision 1.9
retrieving revision 1.9.8.1
diff -C2 -d -r1.9 -r1.9.8.1
*** build.xml	20 Jan 2007 08:10:14 -0000	1.9
--- build.xml	28 Mar 2007 05:13:25 -0000	1.9.8.1
***************
*** 3,6 ****
--- 3,9 ----
  	<property file="../tolven/resources/ant-build.properties"/>
      <path id="project.classpath">
+         <fileset dir="${tolvenSecurity.location}/build">
+ 			<include name="*.jar"/>
+         </fileset>
          <fileset dir="${tolvenEJB.location}/build">
  			<include name="*.jar"/>

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security/bean AccountProcessingProtectionBean.java, NONE, 1.1.2.1

[Joseph I. <jos...@us...>]

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

Added Files:
      Tag: E_JI_MDBKeys
	AccountProcessingProtectionBean.java 
Log Message:
First stage of having queues encrypted for particular accounts

--- NEW FILE: AccountProcessingProtectionBean.java ---
/*
 *  Copyright (C) 2006 Tolven Inc 
 *
 * This library is free software; you can redistribute it and/or modify it under the terms of 
 * the GNU Lesser General Public License as published by the Free Software Foundation; either 
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU Lesser General Public License for more details.
 * 
 * Contact: in...@to...
 */
package org.tolven.security.bean;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.security.GeneralSecurityException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.util.Set;

import javax.annotation.EJB;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;

import org.tolven.core.AccountDAOLocal;
import org.tolven.core.entity.Account;
import org.tolven.doc.bean.TolvenMessage;
import org.tolven.security.AccountProcessingProtectionLocal;
import org.tolven.security.auth.KeyLdapCallbackHandler;
import org.tolven.security.key.AccountProcessingPrivateKey;
import org.tolven.security.key.AccountProcessingPublicKey;
import org.tolven.security.key.DocumentSecretKey;
import org.tolven.security.key.UserPrivateKey;
import org.tolven.security.key.UserPublicKey;

/**
 * This class protects document content during processing
 * 
 * @author Joseph Isaac
 * 
 */
@Stateless()
@Local(AccountProcessingProtectionLocal.class)
public class AccountProcessingProtectionBean implements AccountProcessingProtectionLocal {

    @EJB
    private AccountDAOLocal accountDAOLocal;

    public void setAsEncryptedContent(byte[] unencryptedContent, TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException {
        Account account = accountDAOLocal.findAccount(tm.getAccountId());
        if (account == null)
            throw new RuntimeException("Cannot find account Id=" + tm.getAccountId() + " for TolvenMessage");
        AccountProcessingPublicKey accountProcessingPublicKey = account.getAccountProcessingPublicKey();
        if (accountProcessingPublicKey == null) {
            LoginContext lc = null;
            try {
                lc = new LoginContext("tolvenLDAP", new KeyLdapCallbackHandler(processingId, processingId.toCharArray()));
                lc.login();
                Subject subject = lc.getSubject();
                Set<UserPublicKey> publicCredentials = subject.getPublicCredentials(UserPublicKey.class);
                UserPublicKey userPublicKey = publicCredentials.iterator().next();
                if (userPublicKey == null)
                    throw new GeneralSecurityException(getClass() + " :No UserPublicKey found for " + processingId);
                AccountProcessingPrivateKey accountProcessingPrivateKey = AccountProcessingPrivateKey.getInstance();
                account.setAccountProcessingPrivateKey(accountProcessingPrivateKey);
                PublicKey publicKey = accountProcessingPrivateKey.init(userPublicKey.getPublicKey());
                account.setAccountProcessingPublicKey(publicKey);
            } finally {
                if (lc != null)
                    lc.logout();
            }
        }
        accountProcessingPublicKey = account.getAccountProcessingPublicKey();
        DocumentSecretKey documentSecretKey = DocumentSecretKey.getInstance();
        SecretKey docSecretKey = documentSecretKey.init(accountProcessingPublicKey.getPublicKey());
        Cipher cipher = Cipher.getInstance(docSecretKey.getAlgorithm());
        cipher.init(Cipher.ENCRYPT_MODE, docSecretKey);
        tm.setPayload(cipher.doFinal(unencryptedContent));
        tm.setEncryptedKeyAlgorithm(docSecretKey.getAlgorithm());
        tm.setEncryptedKey(documentSecretKey.getEncryptedKey());
    }

    public byte[] getDecryptedContent(TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException {
        Account account = accountDAOLocal.findAccount(tm.getAccountId());
        if (account == null)
            throw new RuntimeException("Cannot find account Id=" + tm.getAccountId() + " for TolvenMessage");
        LoginContext lc = null;
        try {
            lc = new LoginContext("tolvenLDAP", new KeyLdapCallbackHandler(processingId, processingId.toCharArray()));
            lc.login();
            Subject subject = lc.getSubject();
            Set<UserPrivateKey> privateCredentials = subject.getPrivateCredentials(UserPrivateKey.class);
            UserPrivateKey userPrivateKey = privateCredentials.iterator().next();
            if (userPrivateKey == null)
                throw new GeneralSecurityException(getClass() + " :No UserPrivateKey found for " + processingId);
            PrivateKey privateKey = userPrivateKey.getPrivateKey();
            AccountProcessingPrivateKey accountProcessingPrivateKey = account.getAccountProcessingPrivateKey();
            if (accountProcessingPrivateKey == null)
                throw new RuntimeException(": No AccountProcessingPrivateKey found for " + processingId);
            //TODO: Get the DocumentSecretKey from the TolvenMessage's encryptedKey
            DocumentSecretKey documentSecretKey = DocumentSecretKey.getInstance();
            documentSecretKey.init(tm.getEncryptedKey(), tm.getEncryptionKeyAlgorithm());
            SecretKey docSecretKey = documentSecretKey.getSecretKey(accountProcessingPrivateKey.getPrivateKey(privateKey));
            Cipher cipher = Cipher.getInstance(tm.getEncryptionKeyAlgorithm());
            cipher.init(Cipher.DECRYPT_MODE, docSecretKey);
            return cipher.doFinal(tm.getPayload());
        } finally {
            if (lc != null)
                lc.logout();
        }
    }

    public InputStream getDecryptedContentAsInputStream(TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException {
        return new ByteArrayInputStream(getDecryptedContent(tm, processingId));
    }
}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security AccountProcessingProtectionLocal.java, NONE, 1.1.2.1

[Joseph I. <jos...@us...>]

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

Added Files:
      Tag: E_JI_MDBKeys
	AccountProcessingProtectionLocal.java 
Log Message:
First stage of having queues encrypted for particular accounts

--- NEW FILE: AccountProcessingProtectionLocal.java ---
/*
 *  Copyright (C) 2006 Tolven Inc 
 *
 * This library is free software; you can redistribute it and/or modify it under the terms of 
 * the GNU Lesser General Public License as published by the Free Software Foundation; either 
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; 
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
 * See the GNU Lesser General Public License for more details.
 * 
 * Contact: in...@to...
 */
package org.tolven.security;

import java.io.IOException;
import java.io.InputStream;
import java.security.GeneralSecurityException;

import javax.security.auth.login.LoginException;

import org.tolven.doc.bean.TolvenMessage;

/**
 * This interface protects the DocBase by handling its encryption and decryption.
 * 
 * @author Joseph Isaac
 * 
 */
public interface AccountProcessingProtectionLocal {

    public static final String  ACCOUNT_PROCESSING_Q_ID = "accountprocessingQ";
    
    public void setAsEncryptedContent(byte[] unencryptedContent, TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException;

    public byte[] getDecryptedContent(TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException;

    public InputStream getDecryptedContentAsInputStream(TolvenMessage tm, String processingId) throws LoginException, GeneralSecurityException, IOException;

}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/bean CreatorBean.java, 1.7, 1.7.2.1

[Joseph I. <jos...@us...>]

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

Modified Files:
      Tag: E_JI_MDBKeys
	CreatorBean.java 
Log Message:
First stage of having queues encrypted for particular accounts

Index: CreatorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** CreatorBean.java	20 Mar 2007 09:13:12 -0000	1.7
--- CreatorBean.java	28 Mar 2007 05:13:23 -0000	1.7.2.1
***************
*** 34,37 ****
--- 34,38 ----
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocXML;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  import org.tolven.trim.Act;
***************
*** 64,67 ****
--- 65,69 ----
  	@EJB XMLProtectedLocal xmlProtectedBean;
      @EJB DocProtectionLocal docProtectionBean;
+     @EJB AccountProcessingProtectionLocal accountProcessingProctectionLocal;
  	
      @Resource(mappedName="java:/JmsXA")
***************
*** 323,327 ****
  //		ByteArrayOutputStream output = new ByteArrayOutputStream( );
  //		xmlBean.marshalTRIM( trim, output );
! 		tm.setPayload(payload);
  //		tm.setPayload(docXML.getContent());
  //		System.out.println( "Payload: " + new String(tm.getPayload()));
--- 325,329 ----
  //		ByteArrayOutputStream output = new ByteArrayOutputStream( );
  //		xmlBean.marshalTRIM( trim, output );
!         accountProcessingProctectionLocal.setAsEncryptedContent(payload, tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID);
  //		tm.setPayload(docXML.getContent());
  //		System.out.println( "Payload: " + new String(tm.getPayload()));
***************
*** 341,345 ****
  		ByteArrayOutputStream output = new ByteArrayOutputStream( );
  		xmlBean.marshalCCR( ccr, output );
! 		tm.setPayload(output.toByteArray());
  		q.send( tm );
  		
--- 343,347 ----
  		ByteArrayOutputStream output = new ByteArrayOutputStream( );
  		xmlBean.marshalCCR( ccr, output );
!         accountProcessingProctectionLocal.setAsEncryptedContent(output.toByteArray(), tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID);
  		q.send( tm );
  		

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/core/entity Account.java, 1.17, 1.17.10.1

[Joseph I. <jos...@us...>]

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

Modified Files:
      Tag: E_JI_MDBKeys
	Account.java 
Log Message:
First stage of having queues encrypted for particular accounts

Index: Account.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/Account.java,v
retrieving revision 1.17
retrieving revision 1.17.10.1
diff -C2 -d -r1.17 -r1.17.10.1
*** Account.java	20 Jan 2007 19:23:17 -0000	1.17
--- Account.java	28 Mar 2007 05:13:23 -0000	1.17.10.1
***************
*** 18,21 ****
--- 18,23 ----
  import java.security.GeneralSecurityException;
  import java.security.PublicKey;
+ import javax.persistence.AttributeOverride;
+ import javax.persistence.AttributeOverrides;
  import javax.persistence.CascadeType;
  import javax.persistence.Column;
***************
*** 30,33 ****
--- 32,37 ----
  import javax.persistence.Table;
  
+ import org.tolven.security.key.AccountProcessingPrivateKey;
+ import org.tolven.security.key.AccountProcessingPublicKey;
  import org.tolven.security.key.AccountPublicKey;
  
***************
*** 72,75 ****
--- 76,98 ----
      @Embedded
      private AccountPublicKey accountPublicKey;
+ 
+     @Embedded
+     @AttributeOverrides({
+         @AttributeOverride(name="x509EncodedKeySpec",column=@Column(name="processing_x509_encoded__key_spec")),
+         @AttributeOverride(name="algorithm",column=@Column(name="processing_public_key_algorithm"))
+     })
+     private AccountProcessingPublicKey accountProcessingPublicKey;
+ 
+     /*
+     @AttributeOverrides({
+         @AttributeOverride(name="encodedEncryptedPrivateKeyInfo",column=@Column(name="processing_encoded_encrypted_private_key_info")),
+         @AttributeOverride(name="keySize",column=@Column(name="processing_private_key_size")),
+         @AttributeOverride(name="algorithm",column=@Column(name="processing_algorithm")),
+         @AttributeOverride(name="encryptedKey",column=@Column(name="processing_encrypted_secret_key")),
+         @AttributeOverride(name="algorithm",column=@Column(name="processing_secret_key_algorithm"))
+     })
+     */
+     @Embedded
+     private AccountProcessingPrivateKey accountProcessingPrivateKey;
      
      /**
***************
*** 216,219 ****
--- 239,263 ----
          return accountPublicKey != null;
      }
+ 
+     public AccountProcessingPublicKey getAccountProcessingPublicKey() {
+         return accountProcessingPublicKey;
+     }
+ 
+     public AccountProcessingPrivateKey getAccountProcessingPrivateKey() {
+         return accountProcessingPrivateKey;
+     }
+ 
+     public void setAccountProcessingPublicKey(PublicKey aPublicKey) {
+         accountProcessingPublicKey = AccountProcessingPublicKey.getInstance();
+         accountProcessingPublicKey.init(aPublicKey);
+     }
+ 
+     public void setAccountProcessingPrivateKey(AccountProcessingPrivateKey anAccountProcessingPrivateKey) {
+         accountProcessingPrivateKey = anAccountProcessingPrivateKey;
+     }
+ 
+     public boolean hasAccountProcessingPrivateKey() {
+         return accountProcessingPrivateKey != null;
+     }
      
      

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen/bean GenDriver.java, 1.5, 1.5.10.1

[Joseph I. <jos...@us...>]

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

Modified Files:
      Tag: E_JI_MDBKeys
	GenDriver.java 
Log Message:
First stage of having queues encrypted for particular accounts

Index: GenDriver.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenDriver.java,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -C2 -d -r1.5 -r1.5.10.1
*** GenDriver.java	12 Feb 2007 07:07:27 -0000	1.5
--- GenDriver.java	28 Mar 2007 05:13:23 -0000	1.5.10.1
***************
*** 15,19 ****
  
  import java.io.ByteArrayOutputStream;
- import java.io.StringWriter;
  
  import javax.annotation.EJB;
--- 15,18 ----
***************
*** 27,35 ****
  import javax.jms.ObjectMessage;
  import javax.jms.Queue;
- import javax.xml.bind.JAXBContext;
- import javax.xml.bind.JAXBElement;
- import javax.xml.bind.JAXBException;
- import javax.xml.bind.Marshaller;
- import javax.xml.namespace.QName;
  
  import org.tolven.ccr.ContinuityOfCareRecord;
--- 26,29 ----
***************
*** 41,44 ****
--- 35,39 ----
  import org.tolven.gen.model.GenMedicalCCR;
  import org.tolven.gen.util.FamilyGenerator;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  /**
   * Control the Data Generator process. This process starts when a client queues a message to the 
***************
*** 69,72 ****
--- 64,69 ----
  
      @EJB private XMLLocal xmlBean;
+ 
+     @EJB private AccountProcessingProtectionLocal accountProcessingProctectionLocal;
      
  //    private JAXBContext jc = null;
***************
*** 133,163 ****
  				GenControlFamily control = (GenControlFamily) ((ObjectMessage)msg).getObject();
  				System.out.println("start: " + control);
! //				TolvenUser user = em.find(TolvenUser.class, control.getUserId());
! //				Account chrAccount = em.find(Account.class, control.getChrAccountId());
! 				GenMedicalCCR generator = new GenMedicalCCR( control.getNow(), control.getStartYear());
! 				generator.setFamily(control.getFamilyUnit());
! 				String baseSeq = "" + control.getNow().getTime();
! 				Queuer q = new Queuer();
! 				q.init(connectionFactory, ruleQueue);
! 				int seq = 0;
! 				for (FamilyMember member : control.getFamilyUnit().getMembers()) {
! 					generator.setVp(member.getPerson());
! 					seq++;
! 					generator.setDocumentId(OID + "." + baseSeq + "." + seq );
! 					// Create a CCR document which will be the target for this operation
! 					ContinuityOfCareRecord ccr = generator.generate( );
! 					// Send the resulting document to toven for persistence and rule processing
! 					TolvenMessage tm = new TolvenMessage();
! 					tm.setAccountId(control.getChrAccountId());
! 					tm.setAuthorId(control.getUserId());
! 					tm.setXmlName("ContinuityOfCareRecord");
! 					tm.setXmlNS( "urn:astm-org:CCR");
! 					ByteArrayOutputStream output = new ByteArrayOutputStream( );
! 					xmlBean.marshalCCR( ccr, output );
! 					tm.setPayload(output.toByteArray());
! 					q.send( tm );
! //					System.out.println(tm.getPayload());
! 				}
! 				q.close();
  				System.out.println("Finished generating: " + control);
  			}
--- 130,160 ----
  				GenControlFamily control = (GenControlFamily) ((ObjectMessage)msg).getObject();
  				System.out.println("start: " + control);
! //				    TolvenUser user = em.find(TolvenUser.class, control.getUserId());
! //				    Account chrAccount = em.find(Account.class, control.getChrAccountId());
!                     GenMedicalCCR generator = new GenMedicalCCR( control.getNow(), control.getStartYear());
!                     generator.setFamily(control.getFamilyUnit());
!                     String baseSeq = "" + control.getNow().getTime();
!     				Queuer q = new Queuer();
!     				q.init(connectionFactory, ruleQueue);
!     				int seq = 0;
!     				for (FamilyMember member : control.getFamilyUnit().getMembers()) {
!     					generator.setVp(member.getPerson());
!     					seq++;
!     					generator.setDocumentId(OID + "." + baseSeq + "." + seq );
!     					// Create a CCR document which will be the target for this operation
!     					ContinuityOfCareRecord ccr = generator.generate( );
!     					// Send the resulting document to toven for persistence and rule processing
!     					TolvenMessage tm = new TolvenMessage();
!     					tm.setAccountId(control.getChrAccountId());
!     					tm.setAuthorId(control.getUserId());
!     					tm.setXmlName("ContinuityOfCareRecord");
!     					tm.setXmlNS( "urn:astm-org:CCR");
!     					ByteArrayOutputStream output = new ByteArrayOutputStream( );
!     					xmlBean.marshalCCR( ccr, output );
!                         accountProcessingProctectionLocal.setAsEncryptedContent(output.toByteArray(), tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID);
!     					q.send( tm );
!     //					System.out.println(tm.getPayload());
!     				}
!     				q.close();
  				System.out.println("Finished generating: " + control);
  			}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/bean Evaluator.java, 1.11, 1.11.2.1 DocumentBean.java, 1.22, 1.22.2.1 TolvenMessage.java, 1.3.10.2, 1.3.10.3 EvaluateCCRPersonal.java, 1.4, 1.4.2.1 EvaluateCCRClinical.java, 1.3, 1.3.2.1 EvaluateCCR.java, 1.2, 1.2.2.1

[Joseph I. <jos...@us...>]

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

Modified Files:
      Tag: E_JI_MDBKeys
	Evaluator.java DocumentBean.java TolvenMessage.java 
	EvaluateCCRPersonal.java EvaluateCCRClinical.java 
	EvaluateCCR.java 
Log Message:
First stage of having queues encrypted for particular accounts

Index: DocumentBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** DocumentBean.java	20 Mar 2007 09:13:07 -0000	1.22
--- DocumentBean.java	28 Mar 2007 05:13:22 -0000	1.22.2.1
***************
*** 50,53 ****
--- 50,54 ----
  import org.tolven.doc.entity.DocImage;
  import org.tolven.doc.entity.DocXML;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  
***************
*** 79,82 ****
--- 80,84 ----
  
      @EJB private DocProtectionLocal docProtectionBean;
+     @EJB private AccountProcessingProtectionLocal accountProcessingProctectionLocal;
      
      /**
***************
*** 346,350 ****
  //		tm.setXmlName("trim");
  		tm.setXmlNS( xmlns);
! 		tm.setPayload(payload);
  		q.send( tm );
  		q.close();
--- 348,352 ----
  //		tm.setXmlName("trim");
  		tm.setXmlNS( xmlns);
!         accountProcessingProctectionLocal.setAsEncryptedContent(payload, tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID);
  		q.send( tm );
  		q.close();

Index: TolvenMessage.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/TolvenMessage.java,v
retrieving revision 1.3.10.2
retrieving revision 1.3.10.3
diff -C2 -d -r1.3.10.2 -r1.3.10.3
*** TolvenMessage.java	28 Mar 2007 03:19:29 -0000	1.3.10.2
--- TolvenMessage.java	28 Mar 2007 05:13:22 -0000	1.3.10.3
***************
*** 40,47 ****
  	}
  
- 	public InputStream getPayloadInputStream() {
- 		return new ByteArrayInputStream( payload );
- 	}
- 
  	public String getXmlName() {
  		return xmlName;
--- 40,43 ----

Index: Evaluator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** Evaluator.java	20 Mar 2007 09:13:07 -0000	1.11
--- Evaluator.java	28 Mar 2007 05:13:22 -0000	1.11.2.1
***************
*** 14,20 ****
  package org.tolven.doc.bean;
  
- import java.io.File;
- import java.io.IOException;
- import java.text.ParseException;
  
  import javax.annotation.EJB;
--- 14,17 ----
***************
*** 24,28 ****
  import javax.jms.MessageListener;
  import javax.jms.ObjectMessage;
- import javax.xml.bind.JAXBException;
  
  import org.drools.RuleBase;
--- 21,24 ----
***************
*** 30,55 ****
  import org.tolven.app.MenuLocal;
  import org.tolven.app.bean.AppEvalAdaptor;
- import org.tolven.app.entity.MenuData;
- import org.tolven.app.entity.MenuStructure;
- import org.tolven.ccr.ActorType;
- import org.tolven.ccr.ContinuityOfCareRecord;
- import org.tolven.ccr.DateTimeType;
- import org.tolven.ccr.EncounterType;
- import org.tolven.ccr.PersonNameType;
- import org.tolven.ccr.ProblemType;
- import org.tolven.ccr.ResultType;
- import org.tolven.ccr.TestType;
  import org.tolven.core.AccountDAOLocal;
  import org.tolven.core.entity.Account;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
- import org.tolven.doc.entity.CCRException;
- import org.tolven.doc.entity.DocCCR;
  import org.tolven.doc.entity.DocXML;
  import org.tolven.security.DocProtectionLocal;
- import org.tolven.trim.Act;
- import org.tolven.trim.ActInternal;
- import org.tolven.trim.ActNull;
- import org.tolven.trim.ActSlot;
  import org.tolven.trim.Trim;
  /**
--- 26,36 ----
  import org.tolven.app.MenuLocal;
  import org.tolven.app.bean.AppEvalAdaptor;
  import org.tolven.core.AccountDAOLocal;
  import org.tolven.core.entity.Account;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
  import org.tolven.doc.entity.DocXML;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  import org.tolven.trim.Trim;
  /**
***************
*** 73,76 ****
--- 54,58 ----
      @EJB private XMLLocal xmlBean;
      @EJB private DocProtectionLocal docProtectionBean;
+     @EJB private AccountProcessingProtectionLocal accountProcessingProctectionLocal;
      private static final String CCRns = "urn:astm-org:CCR";	
      private static final String TRIMns = "urn:astm-org:trim:4.0";
***************
*** 84,96 ****
  			TolvenMessage tm = (TolvenMessage) ((ObjectMessage)msg).getObject();
  //			System.out.println( tm.getPayload());
  			if (CCRns.equals(tm.getXmlNS())) {
- 				Account account = accountDAOLocal.findAccount(tm.getAccountId());
  				EvaluateCCR evaluateCCR = null;
  				if ("echr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRClinical( documentLocal, menuLocal, xmlBean, docProtectionBean );
  					evaluateCCR.process( tm );
  				}
  				else if ("ephr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRPersonal(  documentLocal, menuLocal, xmlBean, docProtectionBean );
  					evaluateCCR.process( tm );
  				} else throw new Exception( "Unknown Account type"); 
--- 66,78 ----
  			TolvenMessage tm = (TolvenMessage) ((ObjectMessage)msg).getObject();
  //			System.out.println( tm.getPayload());
+             Account account = accountDAOLocal.findAccount(tm.getAccountId());
  			if (CCRns.equals(tm.getXmlNS())) {
  				EvaluateCCR evaluateCCR = null;
  				if ("echr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRClinical( documentLocal, menuLocal, xmlBean, docProtectionBean, accountProcessingProctectionLocal );
  					evaluateCCR.process( tm );
  				}
  				else if ("ephr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRPersonal(  documentLocal, menuLocal, xmlBean, docProtectionBean, accountProcessingProctectionLocal );
  					evaluateCCR.process( tm );
  				} else throw new Exception( "Unknown Account type"); 
***************
*** 111,115 ****
  			docXML = documentLocal.createXMLDocument( tm.getXmlNS(), tm.getAuthorId(), tm.getAccountId() );
  			System.out.println( "Document created, id: " + docXML.getId());
!             docXML.setAsEncryptedContent(tm.getPayload());
  			System.out.println( "Document set payload, id: " + docXML.getId());
  			documentLocal.finalizeDocument(docXML);
--- 93,97 ----
  			docXML = documentLocal.createXMLDocument( tm.getXmlNS(), tm.getAuthorId(), tm.getAccountId() );
  			System.out.println( "Document created, id: " + docXML.getId());
!             docXML.setAsEncryptedContent(accountProcessingProctectionLocal.getDecryptedContent(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  			System.out.println( "Document set payload, id: " + docXML.getId());
  			documentLocal.finalizeDocument(docXML);
***************
*** 125,129 ****
  		// Get type of account
  		String accountType = docXML.getAccount().getAccountType().getKnownType();
! 		Trim trim = (Trim) xmlBean.unmarshal(tm.getXmlNS(), tm.getPayloadInputStream());
  		RuleBase ruleBase = ruleBaseFactory.open( "rules/" + accountType + ".drl");
         	//load up the rulebase
--- 107,111 ----
  		// Get type of account
  		String accountType = docXML.getAccount().getAccountType().getKnownType();
! 		Trim trim = (Trim) xmlBean.unmarshal(tm.getXmlNS(), accountProcessingProctectionLocal.getDecryptedContentAsInputStream(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  		RuleBase ruleBase = ruleBaseFactory.open( "rules/" + accountType + ".drl");
         	//load up the rulebase

Index: EvaluateCCRClinical.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRClinical.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** EvaluateCCRClinical.java	20 Mar 2007 09:13:07 -0000	1.3
--- EvaluateCCRClinical.java	28 Mar 2007 05:13:22 -0000	1.3.2.1
***************
*** 23,32 ****
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
  import org.tolven.security.DocProtectionLocal;
  
  public class EvaluateCCRClinical extends EvaluateCCR {
  
! 	public EvaluateCCRClinical(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean) {
! 		super(documentLocal, menuLocal, xmlBean, docProtectionBean);
  	}
  
--- 23,33 ----
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  
  public class EvaluateCCRClinical extends EvaluateCCR {
  
! 	public EvaluateCCRClinical(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean, AccountProcessingProtectionLocal accountProcessingProctectionLocal) {
! 		super(documentLocal, menuLocal, xmlBean, docProtectionBean, accountProcessingProctectionLocal);
  	}
  
***************
*** 35,43 ****
  		System.out.println( "Processing CCR document for clinical account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
!         docCCR.setAsEncryptedContent(tm.getPayload());
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
  //		String accountType = docCCR.getAccount().getAccountType().getKnownType();
! 		ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) xmlBean.unmarshal(tm.getXmlNS(), tm.getPayloadInputStream());
  		processPatient( docCCR.getAccount(), docCCR.getId(), ccr);
  	}
--- 36,44 ----
  		System.out.println( "Processing CCR document for clinical account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
!         docCCR.setAsEncryptedContent(accountProcessingProctectionLocal.getDecryptedContent(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
  //		String accountType = docCCR.getAccount().getAccountType().getKnownType();
! 		ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) xmlBean.unmarshal(tm.getXmlNS(), accountProcessingProctectionLocal.getDecryptedContentAsInputStream(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  		processPatient( docCCR.getAccount(), docCCR.getId(), ccr);
  	}

Index: EvaluateCCR.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCR.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** EvaluateCCR.java	20 Mar 2007 09:13:07 -0000	1.2
--- EvaluateCCR.java	28 Mar 2007 05:13:22 -0000	1.2.2.1
***************
*** 4,7 ****
--- 4,8 ----
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  
***************
*** 11,20 ****
      protected XMLLocal xmlBean;
      protected DocProtectionLocal docProtectionBean;
  
!     public EvaluateCCR(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean ) {
      	this.documentLocal = documentLocal;
      	this.menuLocal = menuLocal;
      	this.xmlBean = xmlBean;
          this.docProtectionBean = docProtectionBean;
      }
      
--- 12,23 ----
      protected XMLLocal xmlBean;
      protected DocProtectionLocal docProtectionBean;
+     protected AccountProcessingProtectionLocal accountProcessingProctectionLocal;
  
!     public EvaluateCCR(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean, AccountProcessingProtectionLocal accountProcessingProctectionLocal ) {
      	this.documentLocal = documentLocal;
      	this.menuLocal = menuLocal;
      	this.xmlBean = xmlBean;
          this.docProtectionBean = docProtectionBean;
+         this.accountProcessingProctectionLocal = accountProcessingProctectionLocal;
      }
      

Index: EvaluateCCRPersonal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRPersonal.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** EvaluateCCRPersonal.java	20 Mar 2007 09:13:07 -0000	1.4
--- EvaluateCCRPersonal.java	28 Mar 2007 05:13:22 -0000	1.4.2.1
***************
*** 26,35 ****
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
  import org.tolven.security.DocProtectionLocal;
  
  public class EvaluateCCRPersonal extends EvaluateCCR {
  
! 	public EvaluateCCRPersonal(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean) {
! 		super(documentLocal, menuLocal, xmlBean, docProtectionBean);
  	}
  
--- 26,36 ----
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
+ import org.tolven.security.AccountProcessingProtectionLocal;
  import org.tolven.security.DocProtectionLocal;
  
  public class EvaluateCCRPersonal extends EvaluateCCR {
  
! 	public EvaluateCCRPersonal(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean, DocProtectionLocal docProtectionBean, AccountProcessingProtectionLocal accountProcessingProctectionLocal) {
! 		super(documentLocal, menuLocal, xmlBean, docProtectionBean, accountProcessingProctectionLocal);
  	}
  
***************
*** 38,46 ****
  		System.out.println( "Processing CCR document for personal account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
!         docCCR.setAsEncryptedContent(tm.getPayload());
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
  //		String accountType = docCCR.getAccount().getAccountType().getKnownType();
! 		ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) xmlBean.unmarshal(tm.getXmlNS(), tm.getPayloadInputStream());
  		processPatient( docCCR.getAccount(), docCCR.getId(), ccr);
  	}
--- 39,47 ----
  		System.out.println( "Processing CCR document for personal account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
!         docCCR.setAsEncryptedContent(accountProcessingProctectionLocal.getDecryptedContent(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
  //		String accountType = docCCR.getAccount().getAccountType().getKnownType();
! 		ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) xmlBean.unmarshal(tm.getXmlNS(), accountProcessingProctectionLocal.getDecryptedContentAsInputStream(tm, AccountProcessingProtectionLocal.ACCOUNT_PROCESSING_Q_ID));
  		processPatient( docCCR.getAccount(), docCCR.getId(), ccr);
  	}

[Tolven-cvs-commit] tolvenEJB build.xml,1.19,1.19.2.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolvenEJB
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20712

Modified Files:
      Tag: E_JI_MDBKeys
	build.xml 
Log Message:
First stage of having queues encrypted for particular accounts

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/build.xml,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** build.xml	20 Mar 2007 09:13:06 -0000	1.19
--- build.xml	28 Mar 2007 05:13:22 -0000	1.19.2.1
***************
*** 3,7 ****
  	<property file="../tolven/resources/ant-build.properties"/>
  	<path id="project.classpath">
!         <pathelement location="${tolvenSecurity.location}/build/tolvenSecurity.jar"/>
          <pathelement location="${tolvenEJB.location}/bin"/>
  		<!-- JAXB must be before jboss-client -->
--- 3,9 ----
  	<property file="../tolven/resources/ant-build.properties"/>
  	<path id="project.classpath">
!         <fileset dir="${tolvenSecurity.location}/build">
! 			<include name="*.jar"/>
!         </fileset>
          <pathelement location="${tolvenEJB.location}/bin"/>
  		<!-- JAXB must be before jboss-client -->
***************
*** 80,84 ****
  				<include name="*.jar"/>
  			</zipfileset >
! 			<zipfileset dir="${tolvenEJB.location}/build/bin" includes="**/*.class" excludes="**/AccountUserIdCallback.class" />
  			<zipfileset dir="${tolvenEJB.location}/conf" prefix="META-INF"/>
  			<zipfileset dir="${tolvenEJB.location}/resources/"/>
--- 82,86 ----
  				<include name="*.jar"/>
  			</zipfileset >
! 			<zipfileset dir="${tolvenEJB.location}/build/bin" includes="**/*.class" excludes="**/AccountUserIdCallback.class **/TolvenPrincipal.class **/TolvenGroup.class" />
  			<zipfileset dir="${tolvenEJB.location}/conf" prefix="META-INF"/>
  			<zipfileset dir="${tolvenEJB.location}/resources/"/>