tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolvenMobileServer/src/org/tolven/mobile MobileSecurityFilter.java, 1.2, 1.2.2.1

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

Update of /cvsroot/tolven/tolvenMobileServer/src/org/tolven/mobile
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24639/src/org/tolven/mobile

Modified Files:
      Tag: P_JI_RefreshAPK
	MobileSecurityFilter.java 
Log Message:
Removed the PrivateKeyRing class and will now place UserPrivateKey and AccountPrivateKey directly in the Subject's privateCredentials.

Index: MobileSecurityFilter.java
===================================================================
RCS file: /cvsroot/tolven/tolvenMobileServer/src/org/tolven/mobile/MobileSecurityFilter.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** MobileSecurityFilter.java	28 Feb 2007 07:01:28 -0000	1.2
--- MobileSecurityFilter.java	18 Mar 2007 01:03:09 -0000	1.2.2.1
***************
*** 2,13 ****
  
  import java.io.IOException;
- import java.io.Writer;
  import java.security.Principal;
  import java.security.acl.Group;
  import java.util.Date;
  import java.util.List;
- import java.util.Set;
  
  import javax.annotation.EJB;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
--- 2,15 ----
  
  import java.io.IOException;
  import java.security.Principal;
  import java.security.acl.Group;
  import java.util.Date;
  import java.util.List;
  
  import javax.annotation.EJB;
+ import javax.management.JMException;
+ import javax.management.MBeanServer;
+ import javax.management.MBeanServerFactory;
+ import javax.management.ObjectName;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 26,30 ****
  import org.tolven.core.entity.AccountUser;
  import org.tolven.core.entity.TolvenUser;
- import org.tolven.security.key.PrivateKeyRing;
  
  /**
--- 28,31 ----
***************
*** 93,102 ****
                      System.out.println("Account id " + Long.toString(accountId) + " accepted");
                      long accountUserId = new Long(accountUser.getId());
!                     Set<PrivateKeyRing> privateCredentials = subject.getPrivateCredentials(PrivateKeyRing.class);
!                     if (privateCredentials.isEmpty())
!                         throw new ServletException("No PrivateKeyRing");
!                     PrivateKeyRing privateKeyRing = (PrivateKeyRing) privateCredentials.iterator().next();
!                     privateKeyRing.setAccountPrivateKey(accountUser.getAccountPrivateKey());
                      request.getSession().setAttribute("accountUserId", accountUserId);
                  }
              }
--- 94,101 ----
                      System.out.println("Account id " + Long.toString(accountId) + " accepted");
                      long accountUserId = new Long(accountUser.getId());
!                     request.getSession().setAttribute("accountId", accountUser.getAccount().getId());
                      request.getSession().setAttribute("accountUserId", accountUserId);
+                     //Clear the cache since the user account information is being updated
+                     clearAuthenticationCache(principal);
                  }
              }
***************
*** 110,113 ****
--- 109,121 ----
      }
  
+     private void clearAuthenticationCache(Principal principal) throws JMException {
+         System.out.println(getClass() + " clearAuthenticationCache");
+         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+         ObjectName jaasMgr = new ObjectName("jboss.security:service=JaasSecurityManager");
+         String[] signature = { "java.lang.String", Principal.class.getName() };
+         Object[] params = { "tolvenLDAP", principal };
+         server.invoke(jaasMgr, "flushAuthenticationCache", params, signature);
+     }
+ 
      public void init(FilterConfig config) throws ServletException {
          try

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security/bean DocProtectionBean.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-serv24703/src/org/tolven/security/bean

Modified Files:
      Tag: P_JI_RefreshAPK
	DocProtectionBean.java 
Log Message:
Removed the PrivateKeyRing class and will now place UserPrivateKey and AccountPrivateKey directly in the Subject's privateCredentials.

Index: DocProtectionBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/Attic/DocProtectionBean.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
*** DocProtectionBean.java	17 Mar 2007 11:45:44 -0000	1.1.2.1
--- DocProtectionBean.java	18 Mar 2007 01:03:19 -0000	1.1.2.2
***************
*** 14,20 ****
  package org.tolven.security.bean;
  
- import java.awt.Image;
- import java.awt.Toolkit;
- import java.awt.image.BufferedImage;
  import java.io.IOException;
  import java.io.OutputStream;
--- 14,17 ----
***************
*** 30,34 ****
  import javax.security.auth.Subject;
  import javax.security.jacc.PolicyContext;
- import javax.swing.ImageIcon;
  
  import org.apache.commons.codec.binary.Base64;
--- 27,30 ----
***************
*** 36,40 ****
  import org.tolven.security.DocProtectionLocal;
  import org.tolven.security.key.AccountPrivateKey;
- import org.tolven.security.key.PrivateKeyRing;
  import org.tolven.security.key.UserPrivateKey;
  import org.tolven.doc.entity.DocBase;
--- 32,35 ----
***************
*** 42,47 ****
  
  import com.sun.image.codec.jpeg.ImageFormatException;
- import com.sun.image.codec.jpeg.JPEGCodec;
- import com.sun.image.codec.jpeg.JPEGImageEncoder;
  
  /**
--- 37,40 ----
***************
*** 87,99 ****
              if (principal == null)
                  throw new IllegalStateException("No Principal found in Subject");
!             Set privateCredentials = subject.getPrivateCredentials(PrivateKeyRing.class);
!             if (privateCredentials.isEmpty())
!                 throw new RuntimeException(": No PrivateKeyRing found in Subject " + principal.getName());
!             PrivateKeyRing privateKeyRing = (PrivateKeyRing) privateCredentials.iterator().next();
!             UserPrivateKey userPrivateKey = privateKeyRing.getUserPrivateKey();
              PrivateKey privateKey = userPrivateKey.getPrivateKey();
!             AccountPrivateKey activeAccountPrivateKey = privateKeyRing.getAccountPrivateKey();
              System.out.println(getClass() + " Decrypt doc for account=" + doc.getAccount());
!             System.out.println(getClass() + " Decryption AccountPrivateKey=" + privateKeyRing.getAccountPrivateKey());
              if (doc.getDocumentSecretKey() == null) {
                  //TODO: For backward compatibility, we no longer throw an exception here, since older accounts never had a documenSecretKey and
--- 80,94 ----
              if (principal == null)
                  throw new IllegalStateException("No Principal found in Subject");
!             Set<UserPrivateKey> userPrivateKeys = subject.getPrivateCredentials(UserPrivateKey.class);
!             if (userPrivateKeys.isEmpty())
!                 throw new RuntimeException(": No UserPrivateKey found in Subject " + principal.getName());
!             UserPrivateKey userPrivateKey = userPrivateKeys.iterator().next();
              PrivateKey privateKey = userPrivateKey.getPrivateKey();
!             Set<AccountPrivateKey> accountPrivateKeys = subject.getPrivateCredentials(AccountPrivateKey.class);
!             if (accountPrivateKeys.isEmpty())
!                 throw new RuntimeException(": No AccountPrivateKey found in Subject " + principal.getName());
!             AccountPrivateKey activeAccountPrivateKey = accountPrivateKeys.iterator().next();
              System.out.println(getClass() + " Decrypt doc for account=" + doc.getAccount());
!             System.out.println(getClass() + " Decryption AccountPrivateKey=" + activeAccountPrivateKey);
              if (doc.getDocumentSecretKey() == null) {
                  //TODO: For backward compatibility, we no longer throw an exception here, since older accounts never had a documenSecretKey and

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/entity DocBase.java, 1.22, 1.22.8.1 DocImage.java, 1.1, 1.1.8.1

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	DocBase.java DocImage.java 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

Index: DocImage.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocImage.java,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -C2 -d -r1.1 -r1.1.8.1
*** DocImage.java	31 Aug 2006 05:18:28 -0000	1.1
--- DocImage.java	17 Mar 2007 11:45:44 -0000	1.1.8.1
***************
*** 45,50 ****
  	 * @throws IOException
  	 */
! 	public void streamJPEGThumbnail( int targetWidth, int targetHeight, OutputStream stream) throws ImageFormatException, IOException{
! 		Image sourceImage = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getContent() )).getImage();
  		float hscale = ((float)targetWidth)/((float)sourceImage.getWidth(null));
  		float vscale = ((float)targetHeight)/((float)sourceImage.getHeight(null));
--- 45,50 ----
  	 * @throws IOException
  	 */
! 	public void streamJPEGThumbnail(byte[] unencryptedContent, int targetWidth, int targetHeight, OutputStream stream) throws ImageFormatException, IOException{
! 		Image sourceImage = new ImageIcon(Toolkit.getDefaultToolkit().createImage(unencryptedContent)).getImage();
  		float hscale = ((float)targetWidth)/((float)sourceImage.getWidth(null));
  		float vscale = ((float)targetHeight)/((float)sourceImage.getHeight(null));

Index: DocBase.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocBase.java,v
retrieving revision 1.22
retrieving revision 1.22.8.1
diff -C2 -d -r1.22 -r1.22.8.1
*** DocBase.java	18 Feb 2007 02:10:13 -0000	1.22
--- DocBase.java	17 Mar 2007 11:45:44 -0000	1.22.8.1
***************
*** 14,24 ****
  package org.tolven.doc.entity;
  
- import java.io.PrintStream;
  import java.io.Serializable;
- import java.security.Principal;
- import java.security.PrivateKey;
  import java.security.PublicKey;
- import java.security.acl.Group;
- import java.util.Set;
  
  import javax.crypto.Cipher;
--- 14,19 ----
***************
*** 40,53 ****
  import javax.persistence.ManyToOne;
  import javax.persistence.Table;
- import javax.security.auth.Subject;
- import javax.security.jacc.PolicyContext;
  
  import org.apache.commons.codec.binary.Base64;
  import org.tolven.core.entity.Account;
  import org.tolven.core.entity.TolvenUser;
- import org.tolven.security.key.AccountPrivateKey;
  import org.tolven.security.key.DocumentSecretKey;
- import org.tolven.security.key.PrivateKeyRing;
- import org.tolven.security.key.UserPrivateKey;
  
  
--- 35,43 ----
***************
*** 161,260 ****
  
  	/**
!      * Return the raw contents of the document. This method calls decryption each time it is called.
!      * Decryption takes CPU time and it requires access to security policy which means
!      * the caller must have permission to call this method.
       */
      public byte[] getContent() {
!    		return getDecryptedContent(content);
!     }
! 
! 	
!     /**
!      * Currently assumes all content is encrypted and only the authorized loggedInUser will succeed in getting the readable content
!      * @param encryptedContent
!      * @return
!      */
!     private byte[] getDecryptedContent(byte[] encryptedContent) {
!     	System.out.println( "DocBase.getDecryptedContent");
!         if (encryptedContent == null)
!             return encryptedContent;
!         try {
!             if (account == null)
!                 throw new RuntimeException("Content cannot be retrieved from a document which is not associated with an account");
!             Subject subject = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container");
!             if (subject == null)
!                 throw new IllegalStateException("No Subject found in PolicyContext");
!             //TODO: Assume one Principal at this time. Should the Principal be identified in the Subject or via ejbContext?
!             Principal principal = null;
!             Object obj = null;
!             for (java.util.Iterator iter = subject.getPrincipals().iterator(); iter.hasNext();) {
!                 obj = iter.next();
!                 if (obj instanceof Principal && !(obj instanceof Group)) {
!                     principal = (Principal) obj;
!                     break;
!                 }
!             }
!             if (principal == null)
!                 throw new IllegalStateException("No Principal found in Subject");
!             Set privateCredentials = subject.getPrivateCredentials(PrivateKeyRing.class);
!             if (privateCredentials.isEmpty())
!                 throw new RuntimeException(": No PrivateKeyRing found in Subject " + principal.getName());
!             PrivateKeyRing privateKeyRing = (PrivateKeyRing)privateCredentials.iterator().next();
!             UserPrivateKey userPrivateKey = privateKeyRing.getUserPrivateKey();
!             PrivateKey privateKey = userPrivateKey.getPrivateKey();
!             AccountPrivateKey activeAccountPrivateKey = privateKeyRing.getAccountPrivateKey();
!             if (documentSecretKey == null) {
!                 //TODO: For backward compatibility, we no longer throw an exception here, since older accounts never had a documenSecretKey and
!                 // were thus never encrypted
!                 //throw new RuntimeException("Content cannot be decrypted without a documentSecretKey");
!                 return encryptedContent;
!             }
!             if (activeAccountPrivateKey == null) {
!                 //TODO: No AccountPrivateKey means the content cannot be decrypted....for now give it back as encryptedContent
!                 return encryptedContent;
!             }
!             SecretKey docSecretKey = documentSecretKey.getSecretKey(activeAccountPrivateKey.getPrivateKey(privateKey));
!             Cipher cipher = Cipher.getInstance(docSecretKey.getAlgorithm());
!             cipher.init(Cipher.DECRYPT_MODE, docSecretKey);
!             return cipher.doFinal(encryptedContent);
!         } catch (Exception ex) {
!             ex.printStackTrace();
!             return "THIS DOCUMENT CANNOT BE DECRYPTED".getBytes();
!         }
      }
  
      /**
!      * Return the content as a string. This method calls decryption each time it is called.
!      * Decryption takes CPU time and it requires access to security policy which means
!      * the caller must have permission to call this method.
!      * @return
       */
!     public String getContentString() {
!     	byte [] c = getContent();
!     	if (c==null) return null;
!         return new String(c);
      }
  
!     public void setContent(byte[] content) {
!         this.content = getEncryptedContent(content);
      }
  
!     private byte[] getEncryptedContent(byte[] content) {
!         if (content == null)
!             //TODO: Then presumably the content could not have been encrypted
!             return content;
          try {
!             if (account == null)
                  throw new RuntimeException("Content cannot be added to a document which is not associated with an account");
!             PublicKey accountPublicKey = account.getPublicKey();
              if (accountPublicKey == null) {
!                 //TODO: No accountPublicKey means the content cannot be encrypted....for now give it back as content
!                 return content;
              }
-             documentSecretKey = DocumentSecretKey.getInstance();
-             SecretKey docSecretKey = documentSecretKey.init(accountPublicKey);
-             Cipher cipher = Cipher.getInstance(docSecretKey.getAlgorithm());
-             cipher.init(Cipher.ENCRYPT_MODE, docSecretKey);
-             return cipher.doFinal(content);
          } catch (Exception ex) {
              ex.printStackTrace();
--- 151,194 ----
  
  	/**
!      * Return the raw contents of the document.
       */
      public byte[] getContent() {
!    		return content;
      }
  
      /**
!      * Set the raw encrypted contents for this document
!      * @param content
       */
!     private void setContent(byte[] content) {
!         this.content = content;
      }
  
!     //TODO This method should be protected using package protection for use by the DocProtectionBean
!     public DocumentSecretKey getDocumentSecretKey() {
!         return documentSecretKey;
      }
  
!     /**
!      * Set the content of this document to an encrypted byte array.
!      */
!     public void setAsEncryptedContent(byte[] unencryptedContent) {
          try {
!             if (!isEditable())
!                 throw new RuntimeException("Document is not editable");
!             if (getAccount() == null)
                  throw new RuntimeException("Content cannot be added to a document which is not associated with an account");
!             PublicKey accountPublicKey = getAccount().getPublicKey();
              if (accountPublicKey == null) {
!                 //TODO: No accountPublicKey means the content cannot be encrypted....for now backward compatibility and demo set content unencrypted
!                 System.out.println(getClass() + " No AccountPublicKey found for doc id=" + getId());
!                 setContent(unencryptedContent);
!             } else {
!                 documentSecretKey = DocumentSecretKey.getInstance();
!                 SecretKey docSecretKey = documentSecretKey.init(accountPublicKey);
!                 Cipher cipher = Cipher.getInstance(docSecretKey.getAlgorithm());
!                 cipher.init(Cipher.ENCRYPT_MODE, docSecretKey);
!                 setContent(cipher.doFinal(unencryptedContent));
              }
          } catch (Exception ex) {
              ex.printStackTrace();
***************
*** 263,283 ****
      }
  
-     public void setContentString(String content) {
-         setContent(content.getBytes());
-     }
      /**
!      * Return the contents of the document as base64 encoded.
       */
!     public String getContentB64() {
!         return new String(Base64.encodeBase64(getContent()));
      }
  
      /**
!      * Set the content of this document from a base 64 encoded string.
       */
!     public void setContentB64(String content) {
!         setContent(Base64.decodeBase64(content.getBytes()));
      }
!     
      /**
       * Return the Media type for this document.
--- 197,214 ----
      }
  
      /**
!      * Set the content of this document from a base 64 encoded string.
       */
!     public void setAsEncryptedContentB64(String content) {
!         setAsEncryptedContent(Base64.decodeBase64(content.getBytes()));
      }
  
      /**
!      * Set the content of this document to a string which is encrypted.
       */
!     public void setAsEncryptedContentString(String content) {
!         setAsEncryptedContent(content.getBytes());
      }
! 
      /**
       * Return the Media type for this document.

[Tolven-cvs-commit] tolvenBrowse/src/org/tolven/index BrowseBase.java, 1.1, 1.1.4.1 Browse.java, 1.1, 1.1.4.1

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

Update of /cvsroot/tolven/tolvenBrowse/src/org/tolven/index
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14711/src/org/tolven/index

Modified Files:
      Tag: P_JI_RefreshAPK
	BrowseBase.java Browse.java 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

Index: BrowseBase.java
===================================================================
RCS file: /cvsroot/tolven/tolvenBrowse/src/org/tolven/index/BrowseBase.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** BrowseBase.java	24 Feb 2007 21:58:05 -0000	1.1
--- BrowseBase.java	17 Mar 2007 11:45:56 -0000	1.1.4.1
***************
*** 10,14 ****
  import javax.naming.NamingException;
  import javax.security.auth.Subject;
- import javax.security.auth.login.LoginContext;
  import javax.security.jacc.PolicyContext;
  import javax.servlet.ServletConfig;
--- 10,13 ----
***************
*** 24,27 ****
--- 23,27 ----
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLProtectedLocal;
+ import org.tolven.security.DocProtectionLocal;
  /**
   * The base class for sample HTTP functions. We supply page header and footer functions here.
***************
*** 38,41 ****
--- 38,42 ----
      @EJB protected XMLProtectedLocal xmlProtectedBean;
      @EJB protected ActivationLocal activationLocal;
+     @EJB protected DocProtectionLocal docProtectionBean;
  
  	@Override
***************
*** 50,53 ****
--- 51,55 ----
             xmlProtectedBean = (XMLProtectedLocal) ctx.lookup("tolven/XMLProtectedBean/local");
             activationLocal = (ActivationLocal) ctx.lookup("tolven/ActivationBean/local");
+            docProtectionBean = (DocProtectionLocal) ctx.lookup("tolven/DocProtectionBean/local");
          }
          catch (NamingException e)

Index: Browse.java
===================================================================
RCS file: /cvsroot/tolven/tolvenBrowse/src/org/tolven/index/Browse.java,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** Browse.java	24 Feb 2007 21:58:05 -0000	1.1
--- Browse.java	17 Mar 2007 11:45:56 -0000	1.1.4.1
***************
*** 5,18 ****
  import java.util.Date;
  import java.util.Enumeration;
- import java.util.HashMap;
  import java.util.LinkedList;
  import java.util.List;
  import java.util.Map;
  
- import javax.security.auth.login.LoginContext;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
- import javax.xml.bind.JAXBException;
  
  import org.tolven.app.bean.MenuPath;
--- 5,15 ----
***************
*** 23,28 ****
  import org.tolven.core.entity.AccountUser;
  import org.tolven.doc.entity.DocBase;
- import org.tolven.doc.entity.DocXML;
- import org.tolven.trim.util.TRIMException;
  
  /**
--- 20,23 ----
***************
*** 337,341 ****
  	    writer.write( "<p><em>Document referenced by this menuData item: " + docId + "</em></p>");
  		DocBase doc = documentLocal.findDocument(docId);
! 	    writePreformatted( doc.getContentString(), writer );
  	}
  	
--- 332,336 ----
  	    writer.write( "<p><em>Document referenced by this menuData item: " + docId + "</em></p>");
  		DocBase doc = documentLocal.findDocument(docId);
! 	    writePreformatted( docProtectionBean.getDecryptedContentString(doc), writer );
  	}
  	

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/security VestibuleSecurityFilter.java, 1.19.4.1, 1.19.4.2 GeneralSecurityFilter.java, 1.8.4.1, 1.8.4.2

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	VestibuleSecurityFilter.java GeneralSecurityFilter.java 
Log Message:
Clarified the filter sequencing code

Index: VestibuleSecurityFilter.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/VestibuleSecurityFilter.java,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C2 -d -r1.19.4.1 -r1.19.4.2
*** VestibuleSecurityFilter.java	17 Mar 2007 11:45:51 -0000	1.19.4.1
--- VestibuleSecurityFilter.java	17 Mar 2007 23:24:06 -0000	1.19.4.2
***************
*** 157,172 ****
              }
  
!             // Just asking for password causes us to forget the accountUser
!             if (request.getRequestURL().indexOf("password.jsf") != -1) {
                  session.removeAttribute(ACCOUNTUSER_ID);
                  session.removeAttribute(ACCOUNT_ID);
!                 session.removeAttribute(VESTIBULE_PASS);
!             }
!             //If the user has a pass, they don't need to supply a password again
!             if ("true".equals(session.getAttribute(VESTIBULE_PASS)) || request.getRequestURL().indexOf("password.jsf") != -1) {
!                 // Let the user have the request
!             } else {
!                 ((HttpServletResponse) servletResponse).sendRedirect("password.jsf");
!                 return;
              }
  
--- 157,168 ----
              }
  
!             //If the user has a pass, they don't need to supply a password again
!             if (!"true".equals(session.getAttribute(VESTIBULE_PASS))) {
                  session.removeAttribute(ACCOUNTUSER_ID);
                  session.removeAttribute(ACCOUNT_ID);
!                 if (request.getRequestURL().indexOf("password.jsf") == -1) {
!                     ((HttpServletResponse) servletResponse).sendRedirect("password.jsf");
!                     return;
!                 }
              }
  
***************
*** 179,185 ****
                  if (justLoggedIn) {
                      accountUser = activation.findDefaultAccountUser(user);
-                     if (accountUser != null) {
-                         session.setAttribute(ACCOUNTUSER_ID, accountUser.getId());
-                     }
                  }
              } else {
--- 175,178 ----
***************
*** 194,201 ****
                  // Give TolvenUser the AccountPrivateKey for the selected account
                  if (accountUser.getAccountPrivateKey() == null) {
!                     //For backward compatibility with accounts which didn't originally have keys, we add them here
                      accountBean.setupAccountKeys(accountUser.getAccount(), accountUser, null, user);
                  }
-                 session.removeAttribute(VESTIBULE_PASS);
                  session.setAttribute(ACCOUNT_ID, accountUser.getAccount().getId());
                  session.setAttribute(ACCOUNTUSER_ID, accountUser.getId());
--- 187,193 ----
                  // Give TolvenUser the AccountPrivateKey for the selected account
                  if (accountUser.getAccountPrivateKey() == null) {
!                     //TODO For backward compatibility with accounts which didn't originally have keys, we add them here
                      accountBean.setupAccountKeys(accountUser.getAccount(), accountUser, null, user);
                  }
                  session.setAttribute(ACCOUNT_ID, accountUser.getAccount().getId());
                  session.setAttribute(ACCOUNTUSER_ID, accountUser.getId());
***************
*** 206,215 ****
              }
              // If user has not been sent on there way by here, remove all account related information...they are in the vestibule
-             //privateKeyRing.setAccountPrivateKey(null);
              session.removeAttribute(ACCOUNT_ID);
              session.removeAttribute(ACCOUNTUSER_ID);
!             //TODO Is it really necessary to clear the cache here?
!             //clearAuthenticationCache(principal);
!             System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
              chain.doFilter(servletRequest, servletResponse);
          } catch (PolicyContextException ex) {
--- 198,204 ----
              }
              // If user has not been sent on there way by here, remove all account related information...they are in the vestibule
              session.removeAttribute(ACCOUNT_ID);
              session.removeAttribute(ACCOUNTUSER_ID);
!             //System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
              chain.doFilter(servletRequest, servletResponse);
          } catch (PolicyContextException ex) {

Index: GeneralSecurityFilter.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/GeneralSecurityFilter.java,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -C2 -d -r1.8.4.1 -r1.8.4.2
*** GeneralSecurityFilter.java	17 Mar 2007 11:45:52 -0000	1.8.4.1
--- GeneralSecurityFilter.java	17 Mar 2007 23:24:06 -0000	1.8.4.2
***************
*** 106,110 ****
              }
              HttpSession session = request.getSession();
!             Long accountUserIdObj = (Long)session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
              if (accountUserIdObj == null) {
                  response.sendRedirect("../vestibule/" + getRedirect(principal) + "?" + request.getQueryString());
--- 106,110 ----
              }
              HttpSession session = request.getSession();
!             Long accountUserIdObj = (Long) session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
              if (accountUserIdObj == null) {
                  response.sendRedirect("../vestibule/" + getRedirect(principal) + "?" + request.getQueryString());
***************
*** 126,133 ****
              }
              session.removeAttribute(VestibuleSecurityFilter.VESTIBULE_PASS);
! 			// If we don't have an accountUserId, we have no business being here
! 			Long accountUserId = (Long) session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
! 			// Set accountUser in request for the duration of this request
! 			request.setAttribute("accountUser", activation.findAccountUser( accountUserId ));
              //System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
              chain.doFilter(servletRequest, servletResponse);
--- 126,131 ----
              }
              session.removeAttribute(VestibuleSecurityFilter.VESTIBULE_PASS);
!             // Set accountUser in request for the duration of this request
!             request.setAttribute("accountUser", activation.findAccountUser(accountUserIdObj));
              //System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
              chain.doFilter(servletRequest, servletResponse);

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/security/bean DocProtectionBean.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-serv14620/src/org/tolven/security/bean

Added Files:
      Tag: P_JI_RefreshAPK
	DocProtectionBean.java 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

--- NEW FILE: DocProtectionBean.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.awt.Image;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.acl.Group;
import java.util.Set;

import javax.crypto.Cipher;
import javax.crypto.SecretKey;
import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.security.auth.Subject;
import javax.security.jacc.PolicyContext;
import javax.swing.ImageIcon;

import org.apache.commons.codec.binary.Base64;
import org.jboss.annotation.security.SecurityDomain;
import org.tolven.security.DocProtectionLocal;
import org.tolven.security.key.AccountPrivateKey;
import org.tolven.security.key.PrivateKeyRing;
import org.tolven.security.key.UserPrivateKey;
import org.tolven.doc.entity.DocBase;
import org.tolven.doc.entity.DocImage;

import com.sun.image.codec.jpeg.ImageFormatException;
import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGImageEncoder;

/**
 * This class protects the DocBase content by handling its encryption and decryption.
 * 
 * @author Joseph Isaac
 * 
 */
@Stateless()
@Local(DocProtectionLocal.class)
@SecurityDomain("tolvenLDAP")
//TODO This class should probably be in the same package as DocBase in order to protect the DocBase methods from public view
public class DocProtectionBean implements DocProtectionLocal {

    /**
     * Currently assumes all content is encrypted and only the authorized loggedInUser will succeed in getting the readable content
     * This method calls decryption each time it is called.
     * Decryption takes CPU time and it requires access to security policy which means
     * the caller must have permission to call this method.
     * @param encryptedContent
     * @return
     */
    public byte[] getDecryptedContent(DocBase doc) {
        System.out.println("DocProtectedBean.getDecryptedContent");
        if (doc.getContent() == null)
            return doc.getContent();
        try {
            if (doc.getAccount() == null)
                throw new RuntimeException("Content cannot be retrieved from a document which is not associated with an account");
            Subject subject = (Subject) PolicyContext.getContext("javax.security.auth.Subject.container");
            if (subject == null)
                throw new IllegalStateException("No Subject found in PolicyContext");
            //TODO: Assume one Principal at this time. Should the Principal be identified in the Subject or via ejbContext?
            Principal principal = null;
            Object obj = null;
            for (java.util.Iterator iter = subject.getPrincipals().iterator(); iter.hasNext();) {
                obj = iter.next();
                if (obj instanceof Principal && !(obj instanceof Group)) {
                    principal = (Principal) obj;
                    break;
                }
            }
            if (principal == null)
                throw new IllegalStateException("No Principal found in Subject");
            Set privateCredentials = subject.getPrivateCredentials(PrivateKeyRing.class);
            if (privateCredentials.isEmpty())
                throw new RuntimeException(": No PrivateKeyRing found in Subject " + principal.getName());
            PrivateKeyRing privateKeyRing = (PrivateKeyRing) privateCredentials.iterator().next();
            UserPrivateKey userPrivateKey = privateKeyRing.getUserPrivateKey();
            PrivateKey privateKey = userPrivateKey.getPrivateKey();
            AccountPrivateKey activeAccountPrivateKey = privateKeyRing.getAccountPrivateKey();
            System.out.println(getClass() + " Decrypt doc for account=" + doc.getAccount());
            System.out.println(getClass() + " Decryption AccountPrivateKey=" + privateKeyRing.getAccountPrivateKey());
            if (doc.getDocumentSecretKey() == null) {
                //TODO: For backward compatibility, we no longer throw an exception here, since older accounts never had a documenSecretKey and
                // were thus never encrypted
                //throw new RuntimeException("Content cannot be decrypted without a documentSecretKey");
                System.out.println(getClass() + " No DocumentSecretKey found for doc id=" + doc.getId());
                return doc.getContent();
            }
            if (activeAccountPrivateKey == null) {
                //TODO: No AccountPrivateKey means the content cannot be decrypted....for now give it back as encryptedContent
                System.out.println(getClass() + " No AccountPrivateKey found for doc id=" + doc.getId());
                return doc.getContent();
            }
            SecretKey docSecretKey = doc.getDocumentSecretKey().getSecretKey(activeAccountPrivateKey.getPrivateKey(privateKey));
            Cipher cipher = Cipher.getInstance(docSecretKey.getAlgorithm());
            cipher.init(Cipher.DECRYPT_MODE, docSecretKey);
            return cipher.doFinal(doc.getContent());
        } catch (Exception ex) {
            ex.printStackTrace();
            return "THIS DOCUMENT CANNOT BE DECRYPTED".getBytes();
        }
    }

    /**
     * Return the contents of the document as base64 encoded.
     * This method calls decryption each time it is called.
     * Decryption takes CPU time and it requires access to security policy which means
     * the caller must have permission to call this method.
     */
    public String getDecryptedContentB64(DocBase doc) {
        return new String(Base64.encodeBase64(getDecryptedContent(doc)));
    }


    /**
     * Return the content as a string. This method calls decryption each time it is called.
     * Decryption takes CPU time and it requires access to security policy which means
     * the caller must have permission to call this method.
     * @return
     */
    public String getDecryptedContentString(DocBase doc) {
        byte[] c = getDecryptedContent(doc);
        if (c == null)
            return null;
        return new String(c);
    }

    /**
     * Create a JPEG thumbnail of the underlying image and encode it to the output stream provided.
     * The aspect ratio of the underlying image is retained. As a result, the thumbnail is scaled to fit in
     * the specified rectangle. Whitespace is added if the image does not match the aspect ratio of the rectangle. 
     * @param targetWidth
     * @param targetHeight
     * @param stream
     * @throws ImageFormatException
     * @throws IOException
     */
    public void streamJPEGThumbnail(DocImage doc, int targetWidth, int targetHeight, OutputStream stream) throws ImageFormatException, IOException {
        doc.streamJPEGThumbnail(getDecryptedContent(doc), targetWidth, targetHeight, stream);
    }

}

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/security VestibuleSecurityFilter.java, 1.19, 1.19.4.1 GeneralSecurityFilter.java, 1.8, 1.8.4.1

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	VestibuleSecurityFilter.java GeneralSecurityFilter.java 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

Index: VestibuleSecurityFilter.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/VestibuleSecurityFilter.java,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -C2 -d -r1.19 -r1.19.4.1
*** VestibuleSecurityFilter.java	8 Mar 2007 17:03:41 -0000	1.19
--- VestibuleSecurityFilter.java	17 Mar 2007 11:45:51 -0000	1.19.4.1
***************
*** 21,24 ****
--- 21,28 ----
  import java.util.Set;
  
+ import javax.management.JMException;
+ import javax.management.MBeanServer;
+ import javax.management.MBeanServerFactory;
+ import javax.management.ObjectName;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 47,51 ****
  import org.tolven.security.key.UserPrivateKey;
  import org.tolven.security.key.UserPublicKey;
- import org.tolven.web.TolvenContext;
  
  /**
--- 51,54 ----
***************
*** 85,89 ****
              HttpServletRequest request = (HttpServletRequest) servletRequest;
              HttpServletResponse response = (HttpServletResponse) servletResponse;
!             //System.out.println(getClass() + " :REQUEST=" + request.getRequestURL());
              if (!request.isRequestedSessionIdValid()) {
                  logout("INVALID SESSION", request, response);
--- 88,92 ----
              HttpServletRequest request = (HttpServletRequest) servletRequest;
              HttpServletResponse response = (HttpServletResponse) servletResponse;
!             System.out.println(getClass() + " :REQUEST=" + request.getRequestURL());
              if (!request.isRequestedSessionIdValid()) {
                  logout("INVALID SESSION", request, response);
***************
*** 117,121 ****
                  return;
              }
-             PrivateKeyRing privateKeyRing = (PrivateKeyRing) privateCredentials.iterator().next();
  
              // PHASE ONE: User Authentication
--- 120,123 ----
***************
*** 159,162 ****
--- 161,165 ----
                  session.removeAttribute(ACCOUNTUSER_ID);
                  session.removeAttribute(ACCOUNT_ID);
+                 session.removeAttribute(VESTIBULE_PASS);
              }
              //If the user has a pass, they don't need to supply a password again
***************
*** 194,208 ****
                      accountBean.setupAccountKeys(accountUser.getAccount(), accountUser, null, user);
                  }
-                 privateKeyRing.setAccountPrivateKey(accountUser.getAccountPrivateKey());
                  session.removeAttribute(VESTIBULE_PASS);
                  session.setAttribute(ACCOUNT_ID, accountUser.getAccount().getId());
                  ((HttpServletResponse) servletResponse).sendRedirect("../private/GOTOHOME.jsf");
                  return;
              }
              // If user has not been sent on there way by here, remove all account related information...they are in the vestibule
!             privateKeyRing.setAccountPrivateKey(null);
!             //                top.setAccountUser(null);
              session.removeAttribute(ACCOUNT_ID);
              session.removeAttribute(ACCOUNTUSER_ID);
          } catch (PolicyContextException ex) {
              ex.printStackTrace();
--- 197,216 ----
                      accountBean.setupAccountKeys(accountUser.getAccount(), accountUser, null, user);
                  }
                  session.removeAttribute(VESTIBULE_PASS);
                  session.setAttribute(ACCOUNT_ID, accountUser.getAccount().getId());
+                 session.setAttribute(ACCOUNTUSER_ID, accountUser.getId());
+                 //Clear the cache since the user account information is being updated
+                 clearAuthenticationCache(principal);
                  ((HttpServletResponse) servletResponse).sendRedirect("../private/GOTOHOME.jsf");
                  return;
              }
              // If user has not been sent on there way by here, remove all account related information...they are in the vestibule
!             //privateKeyRing.setAccountPrivateKey(null);
              session.removeAttribute(ACCOUNT_ID);
              session.removeAttribute(ACCOUNTUSER_ID);
+             //TODO Is it really necessary to clear the cache here?
+             //clearAuthenticationCache(principal);
+             System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
+             chain.doFilter(servletRequest, servletResponse);
          } catch (PolicyContextException ex) {
              ex.printStackTrace();
***************
*** 220,225 ****
              ex.printStackTrace();
              throw new ServletException(ex);
          }
-         chain.doFilter(servletRequest, servletResponse);
      }
  
--- 228,235 ----
              ex.printStackTrace();
              throw new ServletException(ex);
+         } catch (JMException ex) {
+             ex.printStackTrace();
+             throw new ServletException(ex);
          }
      }
  
***************
*** 245,248 ****
--- 255,267 ----
      }
  
+     private void clearAuthenticationCache(Principal principal) throws JMException {
+         System.out.println(getClass() + " clearAuthenticationCache");
+         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+         ObjectName jaasMgr = new ObjectName("jboss.security:service=JaasSecurityManager");
+         String[] signature = { "java.lang.String", Principal.class.getName() };
+         Object[] params = { "tolvenLDAP", principal };
+         server.invoke(jaasMgr, "flushAuthenticationCache", params, signature);
+     }
+ 
      public void destroy() {
      }

Index: GeneralSecurityFilter.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/GeneralSecurityFilter.java,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** GeneralSecurityFilter.java	5 Mar 2007 06:07:15 -0000	1.8
--- GeneralSecurityFilter.java	17 Mar 2007 11:45:52 -0000	1.8.4.1
***************
*** 19,22 ****
--- 19,26 ----
  import java.util.Set;
  
+ import javax.management.JMException;
+ import javax.management.MBeanServer;
+ import javax.management.MBeanServerFactory;
+ import javax.management.ObjectName;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 58,66 ****
  
      public String getRedirect(Principal principal) {
!     	TolvenUser user = activation.findUser(principal.getName());
!         if (0==activation.countUserAccounts(user )) {
!         	return "createAccount.jsf";	
          } else {
!         	return "selectAccount.jsf";
          }
      }
--- 62,70 ----
  
      public String getRedirect(Principal principal) {
!         TolvenUser user = activation.findUser(principal.getName());
!         if (0 == activation.countUserAccounts(user)) {
!             return "createAccount.jsf";
          } else {
!             return "selectAccount.jsf";
          }
      }
***************
*** 101,140 ****
                  return;
              }
!             PrivateKeyRing privateKeyRing = (PrivateKeyRing) privateCredentials.iterator().next();
!             if (privateKeyRing.getAccountPrivateKey() == null) {
!                 response.sendRedirect("../vestibule/" + getRedirect( principal )+"?" + request.getQueryString());
                  return;
              }
              if (request.getRequestURL().indexOf("dispatch.jsf") != -1 || request.getRequestURL().indexOf("GOTOHOME") != -1) {
!                 HttpSession session = request.getSession();
!                 Object accountUserIdObj = session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
!                 if (accountUserIdObj == null) {
!                     response.sendRedirect("../vestibule/" + getRedirect( principal ));
!                     return;
!                 }
!                 AccountUser accountUser = activation.findAccountUser(((Long) accountUserIdObj).longValue());
                  if (accountUser == null) {
!                 	response.sendRedirect("../vestibule/" + getRedirect( principal ));
                      return;
                  }
                  // Make absolutely certain the user owns this account
!                 if(!principal.getName().equals(accountUser.getUser().getLdapUID())) {
                      logout(principal.getName() + " DOES NOT MATCH ACCOUNTUSER", request, response);
                  }
                  ((HttpServletResponse) servletResponse).sendRedirect("../private/" + accountUser.getAccount().getAccountType().getHomePage());
                  return;
              }
! 			HttpSession session = request.getSession();
  			// If we don't have an accountUserId, we have no business being here
  			Long accountUserId = (Long) session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
  			// Set accountUser in request for the duration of this request
  			request.setAttribute("accountUser", activation.findAccountUser( accountUserId ));
! 	        chain.doFilter(servletRequest, servletResponse);
          } catch (PolicyContextException ex) {
              ex.printStackTrace();
              throw new ServletException(ex);
          }
      }
  
      public void destroy() {
      }
--- 105,153 ----
                  return;
              }
!             HttpSession session = request.getSession();
!             Long accountUserIdObj = (Long)session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
!             if (accountUserIdObj == null) {
!                 response.sendRedirect("../vestibule/" + getRedirect(principal) + "?" + request.getQueryString());
                  return;
              }
              if (request.getRequestURL().indexOf("dispatch.jsf") != -1 || request.getRequestURL().indexOf("GOTOHOME") != -1) {
!                 AccountUser accountUser = activation.findAccountUser(accountUserIdObj.longValue());
                  if (accountUser == null) {
!                     response.sendRedirect("../vestibule/" + getRedirect(principal));
                      return;
                  }
                  // Make absolutely certain the user owns this account
!                 if (!principal.getName().equals(accountUser.getUser().getLdapUID())) {
                      logout(principal.getName() + " DOES NOT MATCH ACCOUNTUSER", request, response);
                  }
+                 clearAuthenticationCache(principal);
                  ((HttpServletResponse) servletResponse).sendRedirect("../private/" + accountUser.getAccount().getAccountType().getHomePage());
                  return;
              }
!             session.removeAttribute(VestibuleSecurityFilter.VESTIBULE_PASS);
  			// If we don't have an accountUserId, we have no business being here
  			Long accountUserId = (Long) session.getAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID);
  			// Set accountUser in request for the duration of this request
  			request.setAttribute("accountUser", activation.findAccountUser( accountUserId ));
!             //System.out.println(getClass() + " GOT REQUEST=" + request.getRequestURL());
!             chain.doFilter(servletRequest, servletResponse);
          } catch (PolicyContextException ex) {
              ex.printStackTrace();
              throw new ServletException(ex);
+         } catch (JMException ex) {
+             ex.printStackTrace();
+             throw new ServletException(ex);
          }
      }
  
+     private void clearAuthenticationCache(Principal principal) throws JMException {
+         System.out.println(getClass() + " clearAuthenticationCache");
+         MBeanServer server = (MBeanServer) MBeanServerFactory.findMBeanServer(null).get(0);
+         ObjectName jaasMgr = new ObjectName("jboss.security:service=JaasSecurityManager");
+         String[] signature = { "java.lang.String", Principal.class.getName() };
+         Object[] params = { "tolvenLDAP", principal };
+         server.invoke(jaasMgr, "flushAuthenticationCache", params, signature);
+     }
+ 
      public void destroy() {
      }

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web TolvenAction.java, 1.7, 1.7.6.1 AccountAction.java, 1.12.4.1, 1.12.4.2

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	TolvenAction.java AccountAction.java 
Log Message:
Clarified the filter sequencing code

Index: TolvenAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TolvenAction.java,v
retrieving revision 1.7
retrieving revision 1.7.6.1
diff -C2 -d -r1.7 -r1.7.6.1
*** TolvenAction.java	17 Feb 2007 23:07:32 -0000	1.7
--- TolvenAction.java	17 Mar 2007 23:24:07 -0000	1.7.6.1
***************
*** 46,54 ****
  	}
  
! 	protected Object getRequestAttribute( String name ) {
! 		HttpServletRequest req = (HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
! //		System.out.println( "Request attribute: " + name + "=" + req.getAttribute(name));
! 		return req.getAttribute( name );
! 	}
  
  	protected Object getRequestParameter( String name ) {
--- 46,59 ----
  	}
  
!     protected Object getRequestAttribute( String name ) {
!         HttpServletRequest req = (HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
! //      System.out.println( "Request attribute: " + name + "=" + req.getAttribute(name));
!         return req.getAttribute( name );
!     }
! 
!     protected void setSessionAttribute(String name, Object anObject) {
!         Map<String,Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
!         sessionMap.put(name, anObject);
!     }
  
  	protected Object getRequestParameter( String name ) {

Index: AccountAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AccountAction.java,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -d -r1.12.4.1 -r1.12.4.2
*** AccountAction.java	17 Mar 2007 11:45:51 -0000	1.12.4.1
--- AccountAction.java	17 Mar 2007 23:24:07 -0000	1.12.4.2
***************
*** 17,27 ****
  
  import javax.annotation.EJB;
- import javax.faces.context.ExternalContext;
- import javax.faces.context.FacesContext;
  import javax.faces.model.DataModel;
  import javax.faces.model.ListDataModel;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
- import javax.servlet.http.HttpSession;
  
  import org.tolven.core.ActivationLocal;
--- 17,24 ----
***************
*** 107,116 ****
  		}
          // Save accountUserId in session for subsequent request
!         ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
!         HttpSession session = ((HttpSession) ctx.getSession(true));
!         session.setAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID, new Long( accountUser.getId()));
          //TODO The Account and its id can be obtained from accountUser, so is ACCOUNT_ID necessary?
!         session.setAttribute(VestibuleSecurityFilter.ACCOUNT_ID, new Long( accountUser.getAccount().getId()));
! //        getTop().updatePrivateKeyRing();
          return "success";
  	}
--- 104,110 ----
  		}
          // Save accountUserId in session for subsequent request
!         setSessionAttribute(VestibuleSecurityFilter.ACCOUNTUSER_ID, new Long( accountUser.getId()));
          //TODO The Account and its id can be obtained from accountUser, so is ACCOUNT_ID necessary?
!         setSessionAttribute(VestibuleSecurityFilter.ACCOUNT_ID, new Long( accountUser.getAccount().getId()));
          return "success";
  	}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/bean XMLProtectedBean.java, 1.2, 1.2.8.1 EvaluateCCRClinical.java, 1.2, 1.2.8.1 DocumentBean.java, 1.21, 1.21.8.1 Evaluator.java, 1.9, 1.9.4.1 EvaluateCCRPersonal.java, 1.3, 1.3.6.1 EvaluateCCR.java, 1.1, 1.1.8.1

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	XMLProtectedBean.java EvaluateCCRClinical.java 
	DocumentBean.java Evaluator.java EvaluateCCRPersonal.java 
	EvaluateCCR.java 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

Index: DocumentBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v
retrieving revision 1.21
retrieving revision 1.21.8.1
diff -C2 -d -r1.21 -r1.21.8.1
*** DocumentBean.java	4 Feb 2007 16:39:51 -0000	1.21
--- DocumentBean.java	17 Mar 2007 11:45:43 -0000	1.21.8.1
***************
*** 14,18 ****
  package org.tolven.doc.bean;
  
- import java.io.ByteArrayOutputStream;
  import java.io.IOException;
  import java.io.StringReader;
--- 14,17 ----
***************
*** 22,26 ****
  import javax.annotation.EJB;
  import javax.annotation.PostConstruct;
- import javax.annotation.PreDestroy;
  import javax.annotation.Resource;
  import javax.ejb.Local;
--- 21,24 ----
***************
*** 41,46 ****
  import org.tolven.admin.AdministrativeDetail;
  import org.tolven.admin.Details;
- import org.tolven.ccr.ContinuityOfCareRecord;
- import org.tolven.core.TolvenPropertiesLocal;
  import org.tolven.core.entity.Account;
  import org.tolven.core.entity.Status;
--- 39,42 ----
***************
*** 54,59 ****
  import org.tolven.doc.entity.DocImage;
  import org.tolven.doc.entity.DocXML;
! import org.tolven.gen.entity.FamilyMember;
! import org.tolven.trim.Trim;
  
  /**
--- 50,54 ----
  import org.tolven.doc.entity.DocImage;
  import org.tolven.doc.entity.DocXML;
! import org.tolven.security.DocProtectionLocal;
  
  /**
***************
*** 83,86 ****
--- 78,83 ----
      private  Queue ruleQueue; 
  
+     @EJB private DocProtectionLocal docProtectionBean;
+     
      /**
  	 * Get a document by its internal ID
***************
*** 281,285 ****
  	public long createImage( DocImage doc, long userId, long accountId, byte[] content ) {
  		long id =  createDocument( doc, userId, accountId );
! 		doc.setContent(content);
  		return id;
  	}
--- 278,282 ----
  	public long createImage( DocImage doc, long userId, long accountId, byte[] content ) {
  		long id =  createDocument( doc, userId, accountId );
!         doc.setAsEncryptedContent(content);
  		return id;
  	}
***************
*** 321,325 ****
          m.marshal( top, result );
          result.close();
!         doc.setContentString( result.toString() );
          doc.setMediaType( "text/xml");
  	}
--- 318,322 ----
          m.marshal( top, result );
          result.close();
!         doc.setAsEncryptedContentString(result.toString());
          doc.setMediaType( "text/xml");
  	}
***************
*** 336,340 ****
          JAXBContext jc = setupJAXBContext();
          Unmarshaller u = jc.createUnmarshaller();
!         JAXBElement<Details> o = (JAXBElement<Details>) u.unmarshal( new StreamSource( new StringReader( doc.getContentString() ) ) );
          Details details = o.getValue();
          return details.getDetail();
--- 333,337 ----
          JAXBContext jc = setupJAXBContext();
          Unmarshaller u = jc.createUnmarshaller();
!         JAXBElement<Details> o = (JAXBElement<Details>) u.unmarshal( new StreamSource( new StringReader( docProtectionBean.getDecryptedContentString(doc)) ) );
          Details details = o.getValue();
          return details.getDetail();

Index: XMLProtectedBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/XMLProtectedBean.java,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** XMLProtectedBean.java	27 Jan 2007 19:07:05 -0000	1.2
--- XMLProtectedBean.java	17 Mar 2007 11:45:43 -0000	1.2.8.1
***************
*** 3,6 ****
--- 3,7 ----
  import java.io.ByteArrayInputStream;
  
+ import javax.annotation.EJB;
  import javax.ejb.Local;
  import javax.ejb.Remote;
***************
*** 12,15 ****
--- 13,17 ----
  import org.tolven.doc.XMLProtectedRemote;
  import org.tolven.doc.entity.DocXML;
+ import org.tolven.security.DocProtectionLocal;
  
  @Stateless()
***************
*** 19,22 ****
--- 21,25 ----
  public class XMLProtectedBean extends XMLBean implements XMLProtectedLocal, XMLProtectedRemote {
  
+     @EJB private DocProtectionLocal docProtectionBean;
  	/**
  	 * <p>This method will unmarshal the XML content of the specified document
***************
*** 27,31 ****
  	 */
  	public Object unmarshal(DocXML doc) throws JAXBException {
! 		byte[] c = doc.getContent();
  		if (c==null) return null;
  		return unmarshal( doc.getXmlNS(), new ByteArrayInputStream( c ));
--- 30,34 ----
  	 */
  	public Object unmarshal(DocXML doc) throws JAXBException {
! 		byte[] c = docProtectionBean.getDecryptedContent(doc);
  		if (c==null) return null;
  		return unmarshal( doc.getXmlNS(), new ByteArrayInputStream( c ));

Index: Evaluator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -d -r1.9 -r1.9.4.1
*** Evaluator.java	8 Mar 2007 17:09:03 -0000	1.9
--- Evaluator.java	17 Mar 2007 11:45:43 -0000	1.9.4.1
***************
*** 14,21 ****
  package org.tolven.doc.bean;
  
- import java.io.File;
- import java.io.IOException;
- import java.text.ParseException;
- 
  import javax.annotation.EJB;
  import javax.ejb.ActivationConfigProperty;
--- 14,17 ----
***************
*** 24,28 ****
  import javax.jms.MessageListener;
  import javax.jms.ObjectMessage;
- import javax.xml.bind.JAXBException;
  
  import org.drools.RuleBase;
--- 20,23 ----
***************
*** 30,54 ****
  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.trim.Act;
! import org.tolven.trim.ActInternal;
! import org.tolven.trim.ActNull;
! import org.tolven.trim.ActSlot;
  import org.tolven.trim.Trim;
  /**
--- 25,34 ----
  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.DocProtectionLocal;
  import org.tolven.trim.Trim;
  /**
***************
*** 71,74 ****
--- 51,55 ----
  	@EJB private MenuLocal menuLocal;
      @EJB private XMLLocal xmlBean;
+     @EJB private DocProtectionLocal docProtectionBean;
      private static final String CCRns = "urn:astm-org:CCR";	
      private static final String TRIMns = "urn:astm-org:trim:4.0";
***************
*** 86,94 ****
  				EvaluateCCR evaluateCCR = null;
  				if ("echr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRClinical( documentLocal, menuLocal, xmlBean );
  					evaluateCCR.process( tm );
  				}
  				else if ("ephr".equals(account.getAccountType().getKnownType())) {
! 					evaluateCCR = new EvaluateCCRPersonal(  documentLocal, menuLocal, xmlBean );
  					evaluateCCR.process( tm );
  				} else throw new Exception( "Unknown Account type"); 
--- 67,75 ----
  				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"); 
***************
*** 109,113 ****
  			docXML = documentLocal.createXMLDocument( tm.getXmlNS(), tm.getAuthorId(), tm.getAccountId() );
  			System.out.println( "Document created, id: " + docXML.getId());
! 			docXML.setContent(tm.getPayload());
  			System.out.println( "Document set payload, id: " + docXML.getId());
  			documentLocal.finalizeDocument(docXML);
--- 90,94 ----
  			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);

Index: EvaluateCCRClinical.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRClinical.java,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -C2 -d -r1.2 -r1.2.8.1
*** EvaluateCCRClinical.java	16 Feb 2007 04:02:30 -0000	1.2
--- EvaluateCCRClinical.java	17 Mar 2007 11:45:43 -0000	1.2.8.1
***************
*** 23,31 ****
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
  
  public class EvaluateCCRClinical extends EvaluateCCR {
  
! 	public EvaluateCCRClinical(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean) {
! 		super(documentLocal, menuLocal, xmlBean);
  	}
  
--- 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);
  	}
  
***************
*** 34,38 ****
  		System.out.println( "Processing CCR document for clinical account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
! 		docCCR.setContent(tm.getPayload());
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
--- 35,39 ----
  		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

Index: EvaluateCCRPersonal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCRPersonal.java,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** EvaluateCCRPersonal.java	28 Feb 2007 06:58:18 -0000	1.3
--- EvaluateCCRPersonal.java	17 Mar 2007 11:45:43 -0000	1.3.6.1
***************
*** 16,20 ****
  import org.tolven.ccr.EncounterType;
  import org.tolven.ccr.IDType;
- import org.tolven.ccr.MedicationType;
  import org.tolven.ccr.PersonNameType;
  import org.tolven.ccr.ProblemType;
--- 16,19 ----
***************
*** 27,35 ****
  import org.tolven.doc.entity.CCRException;
  import org.tolven.doc.entity.DocCCR;
  
  public class EvaluateCCRPersonal extends EvaluateCCR {
  
! 	public EvaluateCCRPersonal(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean) {
! 		super(documentLocal, menuLocal, xmlBean);
  	}
  
--- 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);
  	}
  
***************
*** 38,42 ****
  		System.out.println( "Processing CCR document for personal account: " + tm.getAccountId());
  		DocCCR docCCR = documentLocal.createCCRDocument( tm.getAuthorId(), tm.getAccountId() );
! 		docCCR.setContent(tm.getPayload());
  		documentLocal.finalizeDocument(docCCR);
  		// Get type of account
--- 38,42 ----
  		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

Index: EvaluateCCR.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/EvaluateCCR.java,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -C2 -d -r1.1 -r1.1.8.1
*** EvaluateCCR.java	12 Feb 2007 07:06:05 -0000	1.1
--- EvaluateCCR.java	17 Mar 2007 11:45:44 -0000	1.1.8.1
***************
*** 1,9 ****
  package org.tolven.doc.bean;
  
- 
  import org.tolven.app.MenuLocal;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
! import org.tolven.doc.entity.CCRException;
  
  public abstract class EvaluateCCR {
--- 1,8 ----
  package org.tolven.doc.bean;
  
  import org.tolven.app.MenuLocal;
  import org.tolven.doc.DocumentLocal;
  import org.tolven.doc.XMLLocal;
! import org.tolven.security.DocProtectionLocal;
  
  public abstract class EvaluateCCR {
***************
*** 11,19 ****
  	protected MenuLocal menuLocal;
      protected XMLLocal xmlBean;
  
!     public EvaluateCCR(DocumentLocal documentLocal, MenuLocal menuLocal, XMLLocal xmlBean ) {
      	this.documentLocal = documentLocal;
      	this.menuLocal = menuLocal;
      	this.xmlBean = xmlBean;
      }
      
--- 10,20 ----
  	protected MenuLocal menuLocal;
      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;
      }
      

[Tolven-cvs-commit] tolvenWEB/web/five/test docDetail.xhtml, 1.3, 1.3.6.1

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	docDetail.xhtml 
Log Message:
Web tier now distinguishes the current account solely by the session accountUserId/accountId attributes, rather than the AccountPrivateKey in the PrivateKeyRing of the web tier Subject. Reauthentications are now occur byf clearing the cache for the principal, which  via the KeyLoginModule, results in the keys for the selected Account making their way to the EJB tier Subject for use in the EJB tier. In the EJB tier, the content of DocBase is now protected by DocProtectionBean, which belongs to the tovlenLDAP SecurityDomain.

Index: docDetail.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/docDetail.xhtml,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -C2 -d -r1.3 -r1.3.6.1
*** docDetail.xhtml	20 Jan 2007 19:25:51 -0000	1.3
--- docDetail.xhtml	17 Mar 2007 11:45:52 -0000	1.3.6.1
***************
*** 40,44 ****
  </h:form>
  <pre>
! #{ccr.docXML.contentString}
  </pre>
         </div>
--- 40,44 ----
  </h:form>
  <pre>
! #{ccr.docXMLContentString}
  </pre>
         </div>

[Tolven-cvs-commit] tolven/template ant-build.template, 1.52, 1.52.2.1

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

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

Modified Files:
      Tag: P_JI_RefreshAPK
	ant-build.template 
Log Message:
Added tolvenSecurity.location

Index: ant-build.template
===================================================================
RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** ant-build.template	1 Mar 2007 22:29:07 -0000	1.52
--- ant-build.template	17 Mar 2007 21:12:26 -0000	1.52.2.1
***************
*** 83,86 ****
--- 83,87 ----
  tolvenMobileServer.location=${tolven.home}/tolvenMobileServer
  tolvenMobileClient.location=${tolven.home}/tolvenMobileClient
+ tolvenSecurity.location=${tolven.home}/tolvenSecurity
  
  jboss-rules.location=${tolven.location}/lib/jboss-rules

[Tolven-cvs-commit] tolvenSecurity/src/org/tolven/web/security/auth UsernamePasswordAccountUserIdCallbackHandler.java, 1.1.2.1, 1.1.2.2

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

Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security/auth
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29538/src/org/tolven/web/security/auth

Modified Files:
      Tag: P_JI_RefreshAPK
	UsernamePasswordAccountUserIdCallbackHandler.java 
Log Message:
Handle usernames and password which are null

Index: UsernamePasswordAccountUserIdCallbackHandler.java
===================================================================
RCS file: /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security/auth/Attic/UsernamePasswordAccountUserIdCallbackHandler.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
*** UsernamePasswordAccountUserIdCallbackHandler.java	10 Mar 2007 21:00:51 -0000	1.1.2.1
--- UsernamePasswordAccountUserIdCallbackHandler.java	15 Mar 2007 08:21:32 -0000	1.1.2.2
***************
*** 56,63 ****
              if (cb instanceof NameCallback) {
                  NameCallback ncb = (NameCallback) cb;
!                 ncb.setName(principal.getName());
              } else if (cb instanceof PasswordCallback) {
                  PasswordCallback pcb = (PasswordCallback) cb;
!                 pcb.setPassword(getPassword());
              } else if (cb instanceof org.tolven.security.auth.AccountUserIdCallback) {
                  AccountUserIdCallback pcb = (AccountUserIdCallback) cb;
--- 56,65 ----
              if (cb instanceof NameCallback) {
                  NameCallback ncb = (NameCallback) cb;
!                 if (principal != null)
!                     ncb.setName(principal.getName());
              } else if (cb instanceof PasswordCallback) {
                  PasswordCallback pcb = (PasswordCallback) cb;
!                 if (credential != null)
!                     pcb.setPassword(getPassword());
              } else if (cb instanceof org.tolven.security.auth.AccountUserIdCallback) {
                  AccountUserIdCallback pcb = (AccountUserIdCallback) cb;

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

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

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

Modified Files:
	TelecommunicationAddressUse.java ActRelationshipSplit.java 
	ActClass.java ContextControl.java ActMood.java 
	RoleLinkType.java EntityDeterminer.java ObjectFactory.java 
	ActStatusSlot.java Observation.java ActBind.java Trim.java 
	EntityNamePartType.java CV.java package-info.java 
	RoleClass.java IVLINT.java EntityClass.java CDSlot.java 
	RealmCode.java OutboundActRelationship.java RoleReference.java 
	CESlot.java EntityNameUse.java Slot.java II.java 
	TsBoundary.java IntegrityCheckAlgorithm.java RoleBind.java 
	GTSSlot.java ActRelationshipJoin.java TELFieldType.java 
	ParticipationType.java ParticipationSubset.java 
	AddressPartType.java GTS.java ActReference.java URL.java 
	ST.java ObservationValueSlot.java IVLINTSlot.java CR.java 
	ActStatus.java RoleParticipation.java 
	InboundActRelationship.java RoleStatus.java SETCESlot.java 
	RoleSlot.java EntityStatus.java ParticipationSignature.java 
	IVLTS.java CD.java PQ.java ActParticipation.java 
	NullFlavor.java ActRelationshipType.java TSSlot.java BL.java 
	ActRelationshipCheckpoint.java AddressUse.java ActNull.java 
	ActRelationshipSubset.java IntegrityCheckType.java 
	RoleInternal.java PostalAddressUse.java ED.java 
	Participation.java BLSlot.java DataType.java STSlot.java 
	RoleNull.java ActSlot.java EntityNamePartQualifier.java 
	UpdateCode.java BinaryDataEncoding.java IntegrityCheck.java 
	RelationshipConjunction.java CompressionAlgorithm.java 
	ActRelationship.java SETIISlot.java ActInternal.java 
	SetOperator.java TimingEvent.java Act.java Role.java 
	EDSlot.java CE.java 
Added Files:
	NewFacet.java NewFacetInput.java NewFacetDefault.java 
	ConcreteDatatype.java NewFacetLabel.java NewFacetValidate.java 
Removed Files:
	RoleParticipations.java ActParticipations.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: EntityStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityStatus.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EntityStatus.java	16 Feb 2007 03:58:26 -0000	1.2
--- EntityStatus.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: BLSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BLSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BLSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- BLSlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActMood.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActMood.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActMood.java	16 Feb 2007 03:58:25 -0000	1.2
--- ActMood.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: SetOperator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SetOperator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SetOperator.java	16 Feb 2007 03:58:26 -0000	1.2
--- SetOperator.java	12 Mar 2007 08:47:12 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: EDSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EDSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EDSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- EDSlot.java	12 Mar 2007 08:47:12 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: InboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/InboundActRelationship.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InboundActRelationship.java	16 Feb 2007 03:58:26 -0000	1.2
--- InboundActRelationship.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: RelationshipConjunction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RelationshipConjunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RelationshipConjunction.java	16 Feb 2007 03:58:26 -0000	1.2
--- RelationshipConjunction.java	12 Mar 2007 08:47:12 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: OutboundActRelationship.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/OutboundActRelationship.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OutboundActRelationship.java	16 Feb 2007 03:58:26 -0000	1.2
--- OutboundActRelationship.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActBind.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActBind.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActBind.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActBind.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: EntityDeterminer.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityDeterminer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EntityDeterminer.java	16 Feb 2007 03:58:26 -0000	1.2
--- EntityDeterminer.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: IVLINT.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLINT.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IVLINT.java	16 Feb 2007 03:58:26 -0000	1.2
--- IVLINT.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: RoleParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleParticipation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RoleParticipation.java	16 Feb 2007 03:58:26 -0000	1.2
--- RoleParticipation.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: DataType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/DataType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataType.java	16 Feb 2007 03:58:26 -0000	1.2
--- DataType.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: EntityNamePartQualifier.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityNamePartQualifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EntityNamePartQualifier.java	16 Feb 2007 03:58:26 -0000	1.2
--- EntityNamePartQualifier.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: GTSSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/GTSSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GTSSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- GTSSlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: BinaryDataEncoding.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BinaryDataEncoding.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BinaryDataEncoding.java	16 Feb 2007 03:58:26 -0000	1.2
--- BinaryDataEncoding.java	12 Mar 2007 08:47:12 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: AddressPartType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressPartType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddressPartType.java	16 Feb 2007 03:58:26 -0000	1.2
--- AddressPartType.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActClass.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActClass.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActClass.java	16 Feb 2007 03:58:25 -0000	1.2
--- ActClass.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

--- NEW FILE: ConcreteDatatype.java ---
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs 
// 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.08 at 11:30:35 PM PST 
//


package org.tolven.trim;

import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlType;


/**
 * <p>Java class for ConcreteDatatype.
 * 
 * <p>The following schema fragment specifies the expected content contained within this class.
 * <p>
 * <pre>
 * &lt;simpleType name="ConcreteDatatype">
 *   &lt;restriction base="{urn:tolven-org:trim:4.0}cs">
 *     &lt;enumeration value="BL"/>
 *     &lt;enumeration value="TS"/>
 *     &lt;enumeration value="ST"/>
 *     &lt;enumeration value="ED"/>
 *     &lt;enumeration value="IVLTS"/>
 *     &lt;enumeration value="PQ"/>
 *     &lt;enumeration value="INT"/>
 *     &lt;enumeration value="REAL"/>
 *     &lt;enumeration value="II"/>
 *     &lt;enumeration value="CD"/>
 *     &lt;enumeration value="CE"/>
 *     &lt;enumeration value="CS"/>
 *     &lt;enumeration value="CO"/>
 *     &lt;enumeration value="IVLPQ"/>
 *   &lt;/restriction>
 * &lt;/simpleType>
 * </pre>
 * 
 */
@XmlType(name = "ConcreteDatatype")
@XmlEnum
public enum ConcreteDatatype {

    BL,
    TS,
    ST,
    ED,
    IVLTS,
    PQ,
    INT,
    REAL,
    II,
    CD,
    CE,
    CS,
    CO,
    IVLPQ;

    public String value() {
        return name();
    }

    public static ConcreteDatatype fromValue(String v) {
        return valueOf(v);
    }

}

Index: ActRelationshipJoin.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipJoin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActRelationshipJoin.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActRelationshipJoin.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

--- NEW FILE: NewFacet.java ---
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs 
// 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.08 at 11:30:35 PM PST 
//


package org.tolven.trim;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;


/**
 * <p>Java class for NewFacet complex type.
 * 
 * <p>The following schema fragment specifies the expected content contained within this class.
 * 
 * <pre>
 * &lt;complexType name="NewFacet">
 *   &lt;complexContent>
 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
 *       &lt;sequence>
 *         &lt;element name="label" type="{urn:tolven-org:trim:4.0}NewFacetLabel" minOccurs="0"/>
 *         &lt;element name="input" type="{urn:tolven-org:trim:4.0}NewFacetInput" minOccurs="0"/>
 *         &lt;element name="default" type="{urn:tolven-org:trim:4.0}NewFacetDefault" minOccurs="0"/>
 *         &lt;element name="validate" type="{urn:tolven-org:trim:4.0}NewFacetValidate" minOccurs="0"/>
 *       &lt;/sequence>
 *       &lt;attribute name="datatype" type="{urn:tolven-org:trim:4.0}ConcreteDatatype" />
 *     &lt;/restriction>
 *   &lt;/complexContent>
 * &lt;/complexType>
 * </pre>
 * 
 * 
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "NewFacet", propOrder = {
    "label",
    "input",
    "_default",
    "validate"
})
public abstract class NewFacet {

    protected NewFacetLabel label;
    protected NewFacetInput input;
    @XmlElement(name = "default")
    protected NewFacetDefault _default;
    protected NewFacetValidate validate;
    @XmlAttribute
    protected ConcreteDatatype datatype;

    /**
     * Gets the value of the label property.
     * 
     * @return
     *     possible object is
     *     {@link NewFacetLabel }
     *     
     */
    public NewFacetLabel getLabel() {
        return label;
    }

    /**
     * Sets the value of the label property.
     * 
     * @param value
     *     allowed object is
     *     {@link NewFacetLabel }
     *     
     */
    public void setLabel(NewFacetLabel value) {
        this.label = value;
    }

    /**
     * Gets the value of the input property.
     * 
     * @return
     *     possible object is
     *     {@link NewFacetInput }
     *     
     */
    public NewFacetInput getInput() {
        return input;
    }

    /**
     * Sets the value of the input property.
     * 
     * @param value
     *     allowed object is
     *     {@link NewFacetInput }
     *     
     */
    public void setInput(NewFacetInput value) {
        this.input = value;
    }

    /**
     * Gets the value of the default property.
     * 
     * @return
     *     possible object is
     *     {@link NewFacetDefault }
     *     
     */
    public NewFacetDefault getDefault() {
        return _default;
    }

    /**
     * Sets the value of the default property.
     * 
     * @param value
     *     allowed object is
     *     {@link NewFacetDefault }
     *     
     */
    public void setDefault(NewFacetDefault value) {
        this._default = value;
    }

    /**
     * Gets the value of the validate property.
     * 
     * @return
     *     possible object is
     *     {@link NewFacetValidate }
     *     
     */
    public NewFacetValidate getValidate() {
        return validate;
    }

    /**
     * Sets the value of the validate property.
     * 
     * @param value
     *     allowed object is
     *     {@link NewFacetValidate }
     *     
     */
    public void setValidate(NewFacetValidate value) {
        this.validate = value;
    }

    /**
     * Gets the value of the datatype property.
     * 
     * @return
     *     possible object is
     *     {@link ConcreteDatatype }
     *     
     */
    public ConcreteDatatype getDatatype() {
        return datatype;
    }

    /**
     * Sets the value of the datatype property.
     * 
     * @param value
     *     allowed object is
     *     {@link ConcreteDatatype }
     *     
     */
    public void setDatatype(ConcreteDatatype value) {
        this.datatype = value;
    }

}

Index: STSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/STSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** STSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- STSlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActRelationshipSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSubset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActRelationshipSubset.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActRelationshipSubset.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActSlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActStatus.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatus.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActStatus.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActStatus.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

--- NEW FILE: NewFacetDefault.java ---
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs 
// 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.08 at 11:30:35 PM PST 
//


package org.tolven.trim;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;


/**
 * <p>Java class for NewFacetDefault complex type.
 * 
 * <p>The following schema fragment specifies the expected content contained within this class.
 * 
 * <pre>
 * &lt;complexType name="NewFacetDefault">
 *   &lt;simpleContent>
 *     &lt;extension base="&lt;urn:tolven-org:trim:4.0>st">
 *       &lt;attribute name="language" type="{urn:tolven-org:trim:4.0}cs" />
 *       &lt;attribute name="special" type="{http://www.w3.org/2001/XMLSchema}string" />
 *     &lt;/extension>
 *   &lt;/simpleContent>
 * &lt;/complexType>
 * </pre>
 * 
 * 
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "NewFacetDefault", propOrder = {
    "value"
})
public class NewFacetDefault {

    @XmlValue
    protected String value;
    @XmlAttribute
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    protected String language;
    @XmlAttribute
    protected String special;

    /**
     * Gets the value of the value property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getValue() {
        return value;
    }

    /**
     * Sets the value of the value property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setValue(String value) {
        this.value = value;
    }

    /**
     * Gets the value of the language property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getLanguage() {
        return language;
    }

    /**
     * Sets the value of the language property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setLanguage(String value) {
        this.language = value;
    }

    /**
     * Gets the value of the special property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getSpecial() {
        return special;
    }

    /**
     * Sets the value of the special property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setSpecial(String value) {
        this.special = value;
    }

}

Index: PostalAddressUse.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/PostalAddressUse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PostalAddressUse.java	16 Feb 2007 03:58:26 -0000	1.2
--- PostalAddressUse.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActRelationshipType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActRelationshipType.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActRelationshipType.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: NullFlavor.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NullFlavor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NullFlavor.java	16 Feb 2007 03:58:26 -0000	1.2
--- NullFlavor.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: TelecommunicationAddressUse.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TelecommunicationAddressUse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TelecommunicationAddressUse.java	16 Feb 2007 03:58:25 -0000	1.2
--- TelecommunicationAddressUse.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: RoleSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RoleSlot.java	16 Feb 2007 03:58:25 -0000	1.2
--- RoleSlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ParticipationType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ParticipationType.java	16 Feb 2007 03:58:26 -0000	1.2
--- ParticipationType.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

--- NEW FILE: NewFacetInput.java ---
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs 
// 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.08 at 11:30:35 PM PST 
//


package org.tolven.trim;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;


/**
 * <p>Java class for NewFacetInput complex type.
 * 
 * <p>The following schema fragment specifies the expected content contained within this class.
 * 
 * <pre>
 * &lt;complexType name="NewFacetInput">
 *   &lt;simpleContent>
 *     &lt;extension base="&lt;urn:tolven-org:trim:4.0>st">
 *       &lt;attribute name="language" type="{urn:tolven-org:trim:4.0}cs" />
 *       &lt;attribute name="type" type="{urn:tolven-org:trim:4.0}cs" />
 *     &lt;/extension>
 *   &lt;/simpleContent>
 * &lt;/complexType>
 * </pre>
 * 
 * 
 */
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "NewFacetInput", propOrder = {
    "value"
})
public class NewFacetInput {

    @XmlValue
    protected String value;
    @XmlAttribute
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    protected String language;
    @XmlAttribute
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
    protected String type;

    /**
     * Gets the value of the value property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getValue() {
        return value;
    }

    /**
     * Sets the value of the value property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setValue(String value) {
        this.value = value;
    }

    /**
     * Gets the value of the language property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getLanguage() {
        return language;
    }

    /**
     * Sets the value of the language property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setLanguage(String value) {
        this.language = value;
    }

    /**
     * Gets the value of the type property.
     * 
     * @return
     *     possible object is
     *     {@link String }
     *     
     */
    public String getType() {
        return type;
    }

    /**
     * Sets the value of the type property.
     * 
     * @param value
     *     allowed object is
     *     {@link String }
     *     
     */
    public void setType(String value) {
        this.type = value;
    }

}

Index: Observation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/Observation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Observation.java	16 Feb 2007 03:58:26 -0000	1.2
--- Observation.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: IntegrityCheckType.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IntegrityCheckType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IntegrityCheckType.java	16 Feb 2007 03:58:26 -0000	1.2
--- IntegrityCheckType.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ParticipationSubset.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationSubset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ParticipationSubset.java	16 Feb 2007 03:58:26 -0000	1.2
--- ParticipationSubset.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: CD.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CD.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CD.java	16 Feb 2007 03:58:26 -0000	1.2
--- CD.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActStatusSlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatusSlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActStatusSlot.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActStatusSlot.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActRelationshipCheckpoint.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipCheckpoint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActRelationshipCheckpoint.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActRelationshipCheckpoint.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ActParticipation.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActParticipation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ActParticipation.java	16 Feb 2007 03:58:26 -0000	1.2
--- ActParticipation.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: SETCESlot.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SETCESlot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SETCESlot.java	16 Feb 2007 03:58:25 -0000	1.2
--- SETCESlot.java	12 Mar 2007 08:47:11 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  

Index: ObjectFactory.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ObjectFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ObjectFactory.java	16 Feb 2007 03:58:26 -0000	1.2
--- ObjectFactory.java	12 Mar 2007 08:47:09 -0000	1.3
***************
*** 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.02.15 at 12:24:57 AM PST 
  //
  
--- 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.08 at 11:30:35 PM PST 
  //
  
***************
*** 38,222 ****
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheck }
       * 
       */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
      }
  
      /**
!      * Create an instance of {@link InboundActRelationship }
       * 
       */
!     public InboundActRelationship createInboundActRelationship() {
!         return new InboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link CR }
       * 
       */
!     public CR createCR() {
!         return new CR();
      }
  
      /**
!      * Create an instance of {@link Observation }
       * 
       */
!     public Observation createObservation() {
!         return new Observation();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link RoleBind }
       * 
       */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheckType }
       * 
       */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
      }
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link CDSlot }
       * 
       */
!     public CDSlot createCDSlot() {
!         return new CDSlot();
      }
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
      }
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
--- 38,222 ----
  
      /**
!      * Create an instance of {@link Trim }
       * 
       */
!     public Trim createTrim() {
!         return new Trim();
      }
  
      /**
!      * Create an instance of {@link Role }
       * 
       */
!     public Role createRole() {
!         return new Role();
      }
  
      /**
!      * Create an instance of {@link CDSlot }
       * 
       */
!     public CDSlot createCDSlot() {
!         return new CDSlot();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link STSlot }
       * 
       */
!     public STSlot createSTSlot() {
!         return new STSlot();
      }
  
      /**
!      * Create an instance of {@link ObservationValueSlot }
       * 
       */
!     public ObservationValueSlot createObservationValueSlot() {
!         return new ObservationValueSlot();
      }
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link ActNull }
       * 
       */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  
      /**
!      * Create an instance of {@link OutboundActRelationship }
       * 
       */
!     public OutboundActRelationship createOutboundActRelationship() {
!         return new OutboundActRelationship();
      }
  
      /**
!      * Create an instance of {@link NewFacetInput }
       * 
       */
!     public NewFacetInput createNewFacetInput() {
!         return new NewFacetInput();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheck }
       * 
       */
!     public IntegrityCheck createIntegrityCheck() {
!         return new IntegrityCheck();
      }
  
      /**
!      * 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 IVLTS }
       * 
       */
!     public IVLTS createIVLTS() {
!         return new IVLTS();
      }
  
      /**
!      * Create an instance of {@link NewFacetValidate }
       * 
       */
!     public NewFacetValidate createNewFacetValidate() {
!         return new NewFacetValidate();
      }
  
      /**
!      * Create an instance of {@link BL }
       * 
       */
!     public BL createBL() {
!         return new BL();
      }
  
      /**
!      * Create an instance of {@link II }
       * 
       */
!     public II createII() {
!         return new II();
      }
  
      /**
!      * Create an instance of {@link SETCESlot }
       * 
       */
!     public SETCESlot createSETCESlot() {
!         return new SETCESlot();
      }
  
      /**
!      * Create an instance of {@link RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
      /**
!      * Create an instance of {@link ActInternal }
       * 
       */
!     public ActInternal createActInternal() {
!         return new ActInternal();
      }
  
      /**
!      * Create an instance of {@link NewFacetLabel }
       * 
       */
!     public NewFacetLabel createNewFacetLabel() {
!         return new NewFacetLabel();
      }
  
      /**
!      * Create an instance of {@link GTS }
       * 
       */
!     public GTS createGTS() {
!         return new GTS();
      }
  
***************
*** 230,278 ****
  
      /**
!      * Create an instance of {@link CV }
       * 
       */
!     public CV createCV() {
!         return new CV();
      }
  
      /**
!      * Create an instance of {@link CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link IVLINT }
       * 
       */
!     public IVLINT createIVLINT() {
!         return new IVLINT();
      }
  
      /**
!      * Create an instance of {@link ActNull }
       * 
       */
!     public ActNull createActNull() {
!         return new ActNull();
      }
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * Create an instance of {@link IVLTS }
       * 
       */
!     public IVLTS createIVLTS() {
!         return new IVLTS();
      }
  
--- 230,294 ----
  
      /**
!      * Create an instance of {@link NewFacetDefault }
       * 
       */
!     public NewFacetDefault createNewFacetDefault() {
!         return new NewFacetDefault();
      }
  
      /**
!      * Create an instance of {@link IntegrityCheckType }
       * 
       */
!     public IntegrityCheckType createIntegrityCheckType() {
!         return new IntegrityCheckType();
      }
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
      /**
!      * Create an instance of {@link DataType }
       * 
       */
!     public DataType createDataType() {
!         return new DataType();
      }
  
      /**
!      * Create an instance of {@link TELFieldType }
       * 
       */
!     public TELFieldType createTELFieldType() {
!         return new TELFieldType();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
!     }
! 
!     /**
!      * Create an instance of {@link ST }
!      * 
!      */
!     public ST createST() {
!         return new ST();
!     }
! 
!     /**
!      * Create an instance of {@link CV }
!      * 
!      */
!     public CV createCV() {
!         return new CV();
      }
  
***************
*** 286,310 ****
  
      /**
!      * Create an instance of {@link TSSlot }
       * 
       */
!     public TSSlot createTSSlot() {
!         return new TSSlot();
      }
  
      /**
!      * Create an instance of {@link TsBoundary }
       * 
       */
!     public TsBoundary createTsBoundary() {
!         return new TsBoundary();
      }
  
      /**
!      * Create an instance of {@link RoleParticipation }
       * 
       */
!     public RoleParticipation createRoleParticipation() {
!         return new RoleParticipation();
      }
  
--- 302,334 ----
  
      /**
!      * Create an instance of {@link GTSSlot }
       * 
       */
!     public GTSSlot createGTSSlot() {
!         return new GTSSlot();
      }
  
      /**
!      * Create an instance of {@link ActParticipation }
       * 
       */
!     public ActParticipation createActParticipation() {
!         return new ActParticipation();
      }
  
      /**
!      * Create an instance of {@link BLSlot }
       * 
       */
!     public BLSlot createBLSlot() {
!         return new BLSlot();
!     }
! 
!     /**
!      * Create an instance of {@link RoleBind }
!      * 
!      */
!     public RoleBind createRoleBind() {
!         return new RoleBind();
      }
  
***************
*** 318,398 ****
  
      /**
!      * Create an instance of {@link Act }
       * 
       */
!     public Act createAct() {
!         return new Act();
      }
  
      /**
!      * Create an instance of {@link ED }
       * 
       */
!     public ED createED() {
!         return new ED();
      }
  
      /**
!      * Create an instance of {@link RoleReference }
       * 
       */
!     public RoleReference createRoleReference() {
!         return new RoleReference();
      }
  
      /**
!      * Create an instance of {@link BL }
       * 
       */
!     public BL createBL() {
!         return new BL();
      }
  
      /**
!      * Create an instance of {@link IVLINTSlot }
       * 
       */
!     public IVLINTSlot createIVLINTSlot() {
!         return new IVLINTSlot();
      }
  
      /**
!      * Create an instance of {@link ST }
       * 
       */
!     public ST createST() {
!         return new ST();
      }
  
      /**
!      * Create an instance of {@link EDSlot }
       * 
       */
!     public EDSlot createEDSlot() {
!         return new EDSlot();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD createCD() {
!         return new CD();
      }
  
      /**
!      * Create an instance of {@link ActBind }
       * 
       */
!     public ActBind createActBind() {
!         return new ActBind();
      }
  
      /**
!      * Create an instance of {@link ActRelationship }
       * 
       */
!     public ActRelationship createActRelationship() {
!         return new ActRelationship();
      }
  
--- 342,422 ----
  
      /**
!      * Create an instance of {@link ActStatusSlot }
       * 
       */
!     public ActStatusSlot createActStatusSlot() {
!         return new ActStatusSlot();
      }
  
      /**
!      * Create an instance of {@link ActReference }
       * 
       */
!     public ActReference createActReference() {
!         return new ActReference();
      }
  
      /**
!      * Create an instance of {@link RoleNull }
       * 
       */
!     public RoleNull createRoleNull() {
!         return new RoleNull();
      }
  
      /**
!      * Create an instance of {@link CE }
       * 
       */
!     public CE createCE() {
!         return new CE();
      }
  
      /**
!      * Create an instance of {@link CD }
       * 
       */
!     public CD crea...
 
[truncated message content]

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/bean TrimBean.java, 1.1, 1.2 AppEvalAdaptor.java, 1.5, 1.6 MenuBean.java, 1.50, 1.51 CreatorBean.java, 1.5, 1.6

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

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

Modified Files:
	TrimBean.java AppEvalAdaptor.java MenuBean.java 
	CreatorBean.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: MenuBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** MenuBean.java	8 Mar 2007 17:13:19 -0000	1.50
--- MenuBean.java	12 Mar 2007 08:47:12 -0000	1.51
***************
*** 36,39 ****
--- 36,40 ----
  import org.tolven.core.entity.Account;
  import org.tolven.core.entity.AccountType;
+ import org.tolven.core.entity.Status;
  import org.tolven.doc.XMLLocal;
  import org.tolven.trim.Act;
***************
*** 166,170 ****
  //		// If the MenuStructure we're looking at is a reference, then we're really going after the referenced items but
  //		// using the reference as a selector.
! 		qs.append(" md.menuStructure = :m"); 
  		// Add any parent keys we may have
  		for ( int x = 0; x < 4; x++ ) {
--- 167,172 ----
  //		// If the MenuStructure we're looking at is a reference, then we're really going after the referenced items but
  //		// using the reference as a selector.
! 		qs.append(" ( md.deleted is null OR md.deleted = false) " );
! 		qs.append(" AND md.menuStructure = :m"); 
  		// Add any parent keys we may have
  		for ( int x = 0; x < 4; x++ ) {
***************
*** 287,295 ****
       */
      public int removeReferencingMenuData( long accountId, long documentId) {
!     	if (0!=documentId) return 0;
!     	Query query = em.createQuery("DELETE FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId");
! 	    query.setParameter( "account", accountId );
! 	    query.setParameter( "docId", documentId );
! 	    return query.executeUpdate();
      }
  	
--- 289,316 ----
       */
      public int removeReferencingMenuData( long accountId, long documentId) {
! 	    System.out.println( "***** Remove MD references to document " + documentId );
!     	if (0==documentId) return 0;
!     	int count = 0;
!     	if (true) {
!     		
! 	    	Query query = em.createQuery("select md FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId");
! 		    query.setParameter( "account", accountId );
! 		    query.setParameter( "docId", documentId );
! 		    List<MenuData> results = query.getResultList();
! 		    count = results.size();
! 		    for (MenuData md : results) {
! 		    	md.setDeleted(true);
! 		    	em.merge(md); // Not really needed
! 			    System.out.println( "Remove " + md.getPath() );
! //		    	em.remove(md);
! 		    }
!     	} else {
! 		    Query query = em.createQuery("DELETE FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId");
! 		    query.setParameter( "account", accountId );
! 		    query.setParameter( "docId", documentId );
! 		    count = query.executeUpdate();
!     	}
! 	    System.out.println( "***** Delete done ****" );
! 	    return count;
      }
  	
***************
*** 717,722 ****
  //				em.persist( newBCC );
  			}
! 				MenuStructure obs = new MenuStructure(
! 						account, doc,    "bar3.xhtml",   null,        4, "obs",  "Observations",  "true", null, "tab" );
  				em.persist( obs );
  				
--- 738,743 ----
  //				em.persist( newBCC );
  			}
! 			MenuStructure obs = new MenuStructure(
! 						account, doc,    "bar3.xhtml",   null,        1, "obs",  "Observations",  "true", null, "tab" );
  				em.persist( obs );
  				

Index: CreatorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CreatorBean.java	8 Mar 2007 17:13:19 -0000	1.5
--- CreatorBean.java	12 Mar 2007 08:47:12 -0000	1.6
***************
*** 27,30 ****
--- 27,31 ----
  import org.tolven.ccr.ContinuityOfCareRecord;
  import org.tolven.core.ActivationLocal;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.core.util.Queuer;
***************
*** 90,93 ****
--- 91,95 ----
  
  	public void scanAct( Act act, List<MenuPath> context ) {
+ 		
  		for (ActParticipation part : act.getParticipations()) {
  			if (part.getRole() instanceof Role) {
***************
*** 232,235 ****
--- 234,238 ----
  		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.
  		ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ;
***************
*** 266,270 ****
  			md.setString01(((Act)actSlot).getTitle().getST().getValue());
  		}
! 		md.setString02( "new");
  		md.setDocumentId(docXML.getId());
  		menuBean.persistMenuData(md);
--- 269,273 ----
  			md.setString01(((Act)actSlot).getTitle().getST().getValue());
  		}
! 		md.setStatus( Status.NEW );
  		md.setDocumentId(docXML.getId());
  		menuBean.persistMenuData(md);
***************
*** 276,280 ****
  		mdToDo.setReference(md);
  		mdToDo.setDate01(md.getDate01());
! 		mdToDo.setString01(md.getParent01().getString01());
  //		mdToDo.setParent01(md.getParent01());
  		mdToDo.setString02("Unfinished " + md.getString01());
--- 279,283 ----
  		mdToDo.setReference(md);
  		mdToDo.setDate01(md.getDate01());
! 		mdToDo.setString01(md.getParent01().getString02() + " " + md.getParent01().getString01());
  //		mdToDo.setParent01(md.getParent01());
  		mdToDo.setString02("Unfinished " + md.getString01());

Index: TrimBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/TrimBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrimBean.java	8 Mar 2007 17:13:19 -0000	1.1
--- TrimBean.java	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 138,147 ****
      }
  
  	/**
  	 * Load all trim objects found in the trim/ resource directory of the jar file.
  	 * @throws IOException, JAXBException 
  	 */
! 	public void loadTrim( URL url ) throws IOException, JAXBException {
! 		
  
  //		System.out.println( "URL=" + url.getFile());
--- 138,165 ----
      }
  
+ 	public void loadTRIM( String name, String resourceName ) throws IOException, JAXBException {
+ 		InputStream input = new BufferedInputStream( Thread.currentThread().getContextClassLoader().getResourceAsStream((resourceName)));
+ 		ByteArrayOutputStream trimXML = new ByteArrayOutputStream(  ); 
+ 		int b;
+ 		while( (b = input.read()) >=0 ) {
+ 			trimXML.write(b);
+ 		}
+ //		String templateName = file.getName().substring(0, file.getName().length()-EXTENSION.length());
+ 		loadTRIM( name, trimXML.toByteArray());
+ 		input.close();
+ 	}
+ 	
  	/**
  	 * Load all trim objects found in the trim/ resource directory of the jar file.
  	 * @throws IOException, JAXBException 
  	 */
! 	public void loadAllTRIM( ) throws IOException, JAXBException {
! 		loadTRIM( "bloodPressure", "trim/bloodPressure.trim");
! 		loadTRIM( "bodyMassIndex", "trim/bodyMassIndex.trim");
! 		loadTRIM( "glucose", "trim/glucose.trim");
! 		loadTRIM( "pulse", "trim/pulse.trim");
! 		loadTRIM( "rash", "trim/rash.trim");
! 		loadTRIM( "temperature", "trim/temperature.trim");
! 		loadTRIM( "weight", "trim/weight.trim");
  
  //		System.out.println( "URL=" + url.getFile());
***************
*** 163,178 ****
  //		for (File file : files) {
  //			InputStream input = new BufferedInputStream( new FileInputStream(file));
- 		InputStream input = new BufferedInputStream( Thread.currentThread().getContextClassLoader().getResourceAsStream(("trim/weight.trim")));
- 			ByteArrayOutputStream trimXML = new ByteArrayOutputStream(  ); 
- 			int b;
- 			while( (b = input.read()) >=0 ) {
- 				trimXML.write(b);
- 			}
- //			String templateName = file.getName().substring(0, file.getName().length()-EXTENSION.length());
- 			String templateName = "Weight";
- 			loadTRIM( templateName, trimXML.toByteArray());
- //		}
  		
  	}
  
  }
--- 181,187 ----
  //		for (File file : files) {
  //			InputStream input = new BufferedInputStream( new FileInputStream(file));
  		
  	}
  
+ 
  }

Index: AppEvalAdaptor.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/AppEvalAdaptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AppEvalAdaptor.java	8 Mar 2007 17:13:19 -0000	1.5
--- AppEvalAdaptor.java	12 Mar 2007 08:47:12 -0000	1.6
***************
*** 2,5 ****
--- 2,6 ----
  
  import java.io.ByteArrayOutputStream;
+ import java.text.ParseException;
  import java.util.ArrayList;
  import java.util.List;
***************
*** 10,13 ****
--- 11,15 ----
  import org.tolven.app.entity.MenuStructure;
  import org.tolven.core.entity.Account;
+ import org.tolven.core.entity.Status;
  import org.tolven.core.entity.TolvenUser;
  import org.tolven.doc.entity.DocBase;
***************
*** 16,19 ****
--- 18,22 ----
  import org.tolven.trim.ActSlot;
  import org.tolven.trim.Trim;
+ import org.tolven.trim.util.TrimFactory;
  
  /**
***************
*** 100,103 ****
--- 103,108 ----
  	 * the document when it was mutable, such as on to do lists. This function is usually called within the transaction that
  	 * creates the index items associated with the document in immutable form.
+ 	 * the other purpose for this function is to "level-the-playing-field for external vs internally generated
+ 	 * data. In  other words, the rules can behave the same regardless of the origin of the data.
  	 * @param docBase
  	 */
***************
*** 172,179 ****
  		md.setAccount(getAccount());
  		md.setParent01(mdParent01);
! 		
! //		md.setDate01(act.getEffectiveTime().getTS());
  		md.setString01(act.getTitle().getST().getValue());
! //		md.setString02( "new");
  		md.setDocumentId(getDocument().getId());
  		menuBean.persistMenuData(md);
--- 177,189 ----
  		md.setAccount(getAccount());
  		md.setParent01(mdParent01);
! 		TrimFactory tf = new TrimFactory();
! 		try {
! 			md.setDate01(tf.toDate(act.getEffectiveTime()));
! 		} catch (ParseException e) {
! 			System.out.println( "Can't convert effectiveTime: " + act.getEffectiveTime().getTS().get(0));
! 			e.printStackTrace();
! 		}
  		md.setString01(act.getTitle().getST().getValue());
! 		md.setStatus( Status.ACTIVE );
  		md.setDocumentId(getDocument().getId());
  		menuBean.persistMenuData(md);
***************
*** 198,201 ****
--- 208,234 ----
  		md.setString01(mdReferenced.getString01() );
  		md.setDocumentId(mdReferenced.getDocumentId());
+ 		md.setString02( mdReferenced.getString02());
+ 		md.setString03( mdReferenced.getString03());
+ 		md.setString04( mdReferenced.getString04());
+ 		md.setDate01( mdReferenced.getDate01());
+ 		md.setDate02( mdReferenced.getDate02());
+ 		md.setDate03( mdReferenced.getDate03());
+ 		md.setDate04( mdReferenced.getDate04());
+ 		md.setPqStringVal01( mdReferenced.getPqStringVal01());
+ 		md.setPqStringVal02( mdReferenced.getPqStringVal02());
+ 		md.setPqStringVal03( mdReferenced.getPqStringVal03());
+ 		md.setPqStringVal04( mdReferenced.getPqStringVal04());
+ 		md.setPqValue01( mdReferenced.getPqValue01());
+ 		md.setPqValue02( mdReferenced.getPqValue02());
+ 		md.setPqValue03( mdReferenced.getPqValue03());
+ 		md.setPqValue04( mdReferenced.getPqValue04());
+ 		md.setPqUnits01( mdReferenced.getPqUnits01());
+ 		md.setPqUnits02( mdReferenced.getPqUnits02());
+ 		md.setPqUnits03( mdReferenced.getPqUnits03());
+ 		md.setPqUnits04( mdReferenced.getPqUnits04());
+ 		md.setLong01( mdReferenced.getLong01());
+ 		md.setLong02( mdReferenced.getLong02());
+ 		md.setLong03( mdReferenced.getLong03());
+ 		md.setLong04( mdReferenced.getLong04());
  		menuBean.persistMenuData(md);
  		System.out.println( "Created reference: " + md.getPath() + " to " + md.getReference().getPath());

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/trim/util TrimFactory.java, 1.1, 1.2

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

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

Modified Files:
	TrimFactory.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: TrimFactory.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/util/TrimFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrimFactory.java	4 Feb 2007 16:39:57 -0000	1.1
--- TrimFactory.java	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 1,6 ****
--- 1,8 ----
  package org.tolven.trim.util;
  
+ import java.text.ParseException;
  import java.text.SimpleDateFormat;
  import java.util.Date;
+ import java.util.GregorianCalendar;
  
  import org.tolven.trim.Act;
***************
*** 13,16 ****
--- 15,19 ----
  import org.tolven.trim.CD;
  import org.tolven.trim.CE;
+ import org.tolven.trim.GTSSlot;
  import org.tolven.trim.II;
  import org.tolven.trim.InboundActRelationship;
***************
*** 92,95 ****
--- 95,115 ----
  	}
  
+ 	/**
+ 	 * Attempt to return a GTS slot as a single value. If not possible, then return null.
+ 	 * The cause can be determined by futher analysis.
+ 	 * @param GTSSlot
+ 	 * @return date
+ 	 * @throws ParseException 
+ 	 */
+ 	public Date toDate( GTSSlot gts ) throws ParseException {
+ 		if (gts==null) return null;
+ 		if (gts.getNull()!=null) return null;
+ 		if (gts.getIVLTS()!=null) return null;
+ 		if (gts.getTS()==null) return null;
+ 		if (gts.getTS().size()!=1) return null;
+ 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssZZ");
+ 		return sdf.parse(gts.getTS().get(0));
+ 	}
+ 
  	public void addEffectiveTimeAsTS( Act act, Date time) {
  		if (null==act.getEffectiveTime()) act.setEffectiveTime(createGTSSlot());

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app TrimLocal.java, 1.1, 1.2 TrimRemote.java, 1.1, 1.2

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

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

Modified Files:
	TrimLocal.java TrimRemote.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: TrimRemote.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/TrimRemote.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrimRemote.java	8 Mar 2007 17:13:19 -0000	1.1
--- TrimRemote.java	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 1,4 ****
--- 1,6 ----
  package org.tolven.app;
  
+ import java.io.IOException;
+ 
  import javax.xml.bind.JAXBException;
  

Index: TrimLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/TrimLocal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrimLocal.java	8 Mar 2007 17:13:19 -0000	1.1
--- TrimLocal.java	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 17,25 ****
  	public void loadTRIM( String name, byte[] trimXML ) throws JAXBException;
  
  	/**
  	 * Load all trim objects found in the trim/ resource directory of the jar file.
  	 * @param url base directory containing the trim content
  	 */
! 	public void loadTrim( URL url ) throws IOException, JAXBException;
  
  	/**
--- 17,27 ----
  	public void loadTRIM( String name, byte[] trimXML ) throws JAXBException;
  
+ 	public void loadTRIM( String name, String resourceName ) throws IOException, JAXBException;
+ 	
  	/**
  	 * Load all trim objects found in the trim/ resource directory of the jar file.
  	 * @param url base directory containing the trim content
  	 */
! 	public void loadAllTRIM(  ) throws IOException, JAXBException;
  
  	/**

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/app/entity MenuData.java, 1.18, 1.19

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

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

Modified Files:
	MenuData.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: MenuData.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity/MenuData.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MenuData.java	8 Mar 2007 17:11:54 -0000	1.18
--- MenuData.java	12 Mar 2007 08:47:12 -0000	1.19
***************
*** 92,95 ****
--- 92,98 ----
      @Enumerated(EnumType.STRING)
      private Status status;
+     
+     @Column( name="DELETED")
+     private Boolean deleted;
  
      @Column( name="PARENT_PATH01")
***************
*** 943,946 ****
--- 946,955 ----
  		this.status = status;
  	}
+ 	public Boolean getDeleted() {
+ 		return deleted;
+ 	}
+ 	public void setDeleted(Boolean deleted) {
+ 		this.deleted = deleted;
+ 	}
  
  }

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/bean Evaluator.java, 1.9, 1.10

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

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

Modified Files:
	Evaluator.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: Evaluator.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Evaluator.java	8 Mar 2007 17:09:03 -0000	1.9
--- Evaluator.java	12 Mar 2007 08:47:09 -0000	1.10
***************
*** 130,133 ****
--- 130,136 ----
          app.setDocument( docXML);
          app.init(menuLocal, workingMemory);
+         
+ 		app.removeReferencingMenuData( docXML);
+ 
          // Assert the document itself.
          workingMemory.assertObject(docXML);

[Tolven-cvs-commit] tolvenEJB/resources/xsd trim4.xsd,1.2,1.3

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

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

Modified Files:
	trim4.xsd 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: trim4.xsd
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** trim4.xsd	16 Feb 2007 03:58:26 -0000	1.2
--- trim4.xsd	12 Mar 2007 08:47:13 -0000	1.3
***************
*** 11,18 ****
  	<xs:complexType name="Trim">
  		<xs:sequence>
! 			<xs:element name="page" type="xs:string" maxOccurs="1"/>
! 			<xs:element name="instance" type="xs:string" maxOccurs="1"/>
  			<xs:element name="menu" type="xs:string" maxOccurs="unbounded"/>
! 			<xs:element name="act" type="ActSlot" maxOccurs="1"/>
  		</xs:sequence>
  	</xs:complexType>
--- 11,21 ----
  	<xs:complexType name="Trim">
  		<xs:sequence>
! 			<xs:element name="page" type="xs:string"/>
! 			<xs:element name="instance" type="xs:string"/>
! 			<xs:element name="documentId" type="xs:string"/>
! 			<xs:element name="element" type="xs:string"/>
! 			<xs:element name="instance" type="xs:string"/>
  			<xs:element name="menu" type="xs:string" maxOccurs="unbounded"/>
! 			<xs:element name="act" type="ActSlot"/>
  		</xs:sequence>
  	</xs:complexType>
***************
*** 260,268 ****
  		</xs:complexContent>
  	</xs:complexType>
  	<xs:complexType name="Slot" abstract="true">
  		<xs:sequence>
! 			<xs:element name="xxx" type="xs:string" form="qualified" minOccurs="0"/>
  		</xs:sequence>
  	</xs:complexType>
  	<xs:complexType name="BLSlot">
  		<xs:complexContent>
--- 263,316 ----
  		</xs:complexContent>
  	</xs:complexType>
+ 
  	<xs:complexType name="Slot" abstract="true">
+ 		<xs:choice>
+ 			<xs:element name="bind" type="xs:string" minOccurs="0"/>
+ 			<xs:element name="new" type="NewFacet" minOccurs="0"/>
+ 		</xs:choice>
+ 	</xs:complexType>
+ 
+ 	<xs:complexType name="NewFacet" abstract="true">
  		<xs:sequence>
! 			<xs:element name="label" type="NewFacetLabel" minOccurs="0"/>
! 			<xs:element name="input" type="NewFacetInput" minOccurs="0" maxOccurs="1"/>
! 			<xs:element name="default" type="NewFacetDefault" minOccurs="0"/>
! 			<xs:element name="validate" type="NewFacetValidate" minOccurs="0"/>
  		</xs:sequence>
+ 		<xs:attribute name="datatype" type="ConcreteDatatype"/>
+ 	</xs:complexType>
+ 	
+ 	<xs:complexType name="NewFacetLabel">
+ 		<xs:simpleContent>
+ 			<xs:extension base="st">
+ 				<xs:attribute name="language" type="cs" use="optional"/>
+ 			</xs:extension>
+ 		</xs:simpleContent>
+ 	</xs:complexType>
+ 	<xs:complexType name="NewFacetInput">
+ 		<xs:simpleContent>
+ 			<xs:extension base="st">
+ 				<xs:attribute name="language" type="cs" use="optional"/>
+ 				<xs:attribute name="type" type="cs" use="optional"/>
+ 			</xs:extension>
+ 		</xs:simpleContent>
+ 	</xs:complexType>
+ 	<xs:complexType name="NewFacetValidate">
+ 		<xs:simpleContent>
+ 			<xs:extension base="st">
+ 				<xs:attribute name="language" type="cs" use="optional"/>
+ 			</xs:extension>
+ 		</xs:simpleContent>
  	</xs:complexType>
+ 
+ 	<xs:complexType name="NewFacetDefault">
+ 		<xs:simpleContent>
+ 			<xs:extension base="st">
+ 				<xs:attribute name="language" type="cs" use="optional"/>
+ 				<xs:attribute name="special" type="xs:string" use="optional"/>
+ 			</xs:extension>
+ 		</xs:simpleContent>
+ 	</xs:complexType>
+ 	
  	<xs:complexType name="BLSlot">
  		<xs:complexContent>
***************
*** 604,607 ****
--- 652,675 ----
  		</xs:restriction>
  	</xs:simpleType>
+ 	
+ 	<xs:simpleType name="ConcreteDatatype">
+ 		<xs:restriction base="cs">
+ 			<xs:enumeration value="BL"/>
+ 			<xs:enumeration value="TS"/>
+ 			<xs:enumeration value="ST"/>
+ 			<xs:enumeration value="ED"/>
+ 			<xs:enumeration value="IVLTS"/>
+ 			<xs:enumeration value="PQ"/>
+ 			<xs:enumeration value="INT"/>
+ 			<xs:enumeration value="REAL"/>
+ 			<xs:enumeration value="II"/>
+ 			<xs:enumeration value="CD"/>
+ 			<xs:enumeration value="CE"/>
+ 			<xs:enumeration value="CS"/>
+ 			<xs:enumeration value="CO"/>
+ 			<xs:enumeration value="IVLPQ"/>
+ 		</xs:restriction>
+ 	</xs:simpleType>
+ 
  	<xs:simpleType name="AddressPartType">
  		<xs:restriction base="cs">

[Tolven-cvs-commit] tolvenEJB/resources/trim weight.trim, 1.1, 1.2 temperature.trim, 1.1, 1.2 bloodPressure.trim, 1.1, 1.2 bodyMassIndex.trim, 1.1, 1.2 glucose.trim, 1.1, 1.2 rash.trim, 1.1, 1.2 pulse.trim, 1.1, 1.2

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

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

Modified Files:
	weight.trim temperature.trim bloodPressure.trim 
	bodyMassIndex.trim glucose.trim rash.trim pulse.trim 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: pulse.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/pulse.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pulse.trim	8 Mar 2007 17:00:19 -0000	1.1
--- pulse.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 4,8 ****
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>glucose.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>
--- 4,8 ----
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>pulse.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>

Index: temperature.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/temperature.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** temperature.trim	8 Mar 2007 17:00:14 -0000	1.1
--- temperature.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 4,8 ****
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>gcs.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>
--- 4,8 ----
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>temperature.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>

Index: bloodPressure.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/bloodPressure.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bloodPressure.trim	8 Mar 2007 17:00:18 -0000	1.1
--- bloodPressure.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 4,8 ****
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>gcs.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>
--- 4,8 ----
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>bloodPressure.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>

Index: weight.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/weight.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** weight.trim	8 Mar 2007 17:00:14 -0000	1.1
--- weight.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 25,29 ****
  			</title>
  			<effectiveTime>
! 				<TS>123</TS>
  			</effectiveTime>
  			<activityTime>
--- 25,29 ----
  			</title>
  			<effectiveTime>
! 				<TS>20070101090000</TS>
  			</effectiveTime>
  			<activityTime>
***************
*** 44,49 ****
  				<value>
  					<PQ>
! 						<value>23.0</value>
! 						<unit>mg/dL</unit>
  					</PQ>
  				</value>
--- 44,49 ----
  				<value>
  					<PQ>
! 						<value></value>
! 						<unit>lb</unit>
  					</PQ>
  				</value>

Index: glucose.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/glucose.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** glucose.trim	8 Mar 2007 17:00:13 -0000	1.1
--- glucose.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 18,28 ****
  			<ST>Serum Glucose</ST>
  		</title>
! 		<effectiveTime>
! 			<TS>tbd</TS>
! 		</effectiveTime>
  		<observation>
  			<value>
  				<PQ>
! 					<value>0.0</value>
  					<unit>mg/dL</unit>
  				</PQ>
--- 18,32 ----
  			<ST>Serum Glucose</ST>
  		</title>
! 		<!-- effectiveTime>
! 			<new datatype="TS">
! 	            <label language="en">Observation time</label>
! 		        <input type="dateTime"/>
! 	            <default special="now"/>
! 	        </new>
! 		</effectiveTime -->
  		<observation>
  			<value>
  				<PQ>
! 					<value></value>
  					<unit>mg/dL</unit>
  				</PQ>

Index: bodyMassIndex.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/bodyMassIndex.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bodyMassIndex.trim	8 Mar 2007 17:00:14 -0000	1.1
--- bodyMassIndex.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 4,8 ****
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>glucose.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>
--- 4,8 ----
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>bodyMassIndex.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>

Index: rash.trim
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/rash.trim,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rash.trim	8 Mar 2007 17:00:19 -0000	1.1
--- rash.trim	12 Mar 2007 08:47:12 -0000	1.2
***************
*** 4,8 ****
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>glucose.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>
--- 4,8 ----
  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
  	xsi:schemaLocation="urn:tolven-org:trim:4.0	E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd">
! 	<page>rash.xhtml</page>
  	<instance>ephr:patient:observation</instance>
  	<menu>ephr:obsMenu</menu>

[Tolven-cvs-commit] tolvenEJB/resources/rules ephr.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-serv29521/resources/rules

Modified Files:
	ephr.drl 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: ephr.drl
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/ephr.drl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ephr.drl	8 Mar 2007 17:00:19 -0000	1.2
--- ephr.drl	12 Mar 2007 08:47:12 -0000	1.3
***************
*** 10,22 ****
  global org.tolven.app.bean.AppEvalAdaptor app;
  
- rule "Clear temporary menu data"
- 	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
--- 10,13 ----
***************
*** 81,84 ****
--- 72,78 ----
  		System.out.println( "Create observation placeholder for " + $patName); 
  		MenuData mdObs = app.createPlaceholder($act, "ephr: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());
  		assert( mdObs );
  end
***************
*** 87,91 ****
   * If we find a (new) observation placeholder, we'll want to add it to the observation list. 
   */
! rule "Place observation placeholder on observation list"
  	when
  		$msObservation: MenuStructure( role == "placeholder", path == "ephr:patient:observation" )
--- 81,85 ----
   * 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 == "ephr:patient:observation" )
***************
*** 95,101 ****
  		// Add act to patient's observation list
  		MenuData mdObsList = app.createReferenceMD( $mdObservation, "ephr:patient:doc:obs:values", $mdPat );
- 		// mdObsList.setPqStringVal01( );
  end
  
  
  /**
--- 89,106 ----
  		// Add act to patient's observation list
  		MenuData mdObsList = app.createReferenceMD( $mdObservation, "ephr: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 == "ephr: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, "ephr:patient:summary:obssum", $mdPat );
+ end
  
  /**
***************
*** 150,153 ****
--- 155,159 ----
  end
  
+ /* Simple rule that displays all placeholders we know about
  rule "Display MS placeholders"
  	when
***************
*** 156,159 ****
--- 162,166 ----
  		System.out.println( "Placeholder: " + $ms.getPath( ));
  end
+ */
  
  /* Not a very interesting rule right now

[Tolven-cvs-commit] tolvenEJB build.xml,1.17,1.18

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

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

Modified Files:
	build.xml 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build.xml	8 Mar 2007 16:59:12 -0000	1.17
--- build.xml	12 Mar 2007 08:47:12 -0000	1.18
***************
*** 123,126 ****
--- 123,128 ----
  		<xjc schema="${tolvenEJB.location}/resources/xsd/trim4.xsd" package="org.tolven.trim" 
  			destdir="${tolvenEJB.location}/src" extension="true">
+ 			<depends dir="${tolvenEJB.location}/resources/xsd/" includes="trim4.xsd"/>
+ 			<produces dir="${tolvenEJB.location}/src" includes="**/*"/>  
  		</xjc>
  	</target>

[Tolven-cvs-commit] tolvenWEB/web/wizard weight.xhtml, 1.1, 1.2 datetime.xhtml, 1.1, 1.2 gcs.xhtml, 1.5, 1.6 wizTemplate.xhtml, 1.6, 1.7 observation.xhtml, 1.2, 1.3

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

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

Modified Files:
	gcs.xhtml wizTemplate.xhtml observation.xhtml 
Added Files:
	weight.xhtml datetime.xhtml 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: gcs.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/gcs.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gcs.xhtml	12 Feb 2007 07:12:29 -0000	1.5
--- gcs.xhtml	12 Mar 2007 08:46:38 -0000	1.6
***************
*** 53,57 ****
  			<div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div>
  			<legend>Assessment Time (T)</legend>
! 			<h:inputText id="gcsT" value="#{trim.trim.acts[0].effectiveTime.TS[0]}" size="30"/>
  			<!-- input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value=""  size="30"/--><br />
  			<a href="javascript:addHours('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1h</a>
--- 53,57 ----
  			<div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div>
  			<legend>Assessment Time (T)</legend>
! 			<h:inputText id="gcsT" value="#{trim.trim.act.effectiveTime.TS[0]}" size="30"/>
  			<!-- input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value=""  size="30"/--><br />
  			<a href="javascript:addHours('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1h</a>

Index: observation.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/observation.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** observation.xhtml	24 Feb 2007 08:13:56 -0000	1.2
--- observation.xhtml	12 Mar 2007 08:46:38 -0000	1.3
***************
*** 17,35 ****
  		<ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/>
  		<ui:define name="steps">
! 		<div class="step" title="Getting Started" >
! 			<div class="pagesm">
! 				<p>Observation test</p>
! 				<p>Click the next button when you're ready to begin.</p>
! 				Value <h:inputText value="#{menu.value}"/><br/>
! 				<h:commandButton id="#{menu.elementLabel}submit" action="#{menu.submit}" value="Submit"/>
! 			</div>
! 			<div class="help" id="#{menu.elementLabel}help1" style="display:none">
! 				<h1>Submission</h1>
! 				<p>The Submit button remains disabled until all entered data is validated and has been stored on the server in your private holding area. 
! 				The time field represents the time when the data was most recently captured on the server (not the time of the observation). Clicking the submit button will
! 				mark this document as complete, actionable, and immutable.</p>
! 			</div>
! 		</div>
! 		
  		</ui:define>
  	</ui:composition>
--- 17,21 ----
  		<ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/>
  		<ui:define name="steps">
! 			<ui:include src="../wizard/#{trim.trim.page}"/>
  		</ui:define>
  	</ui:composition>

Index: wizTemplate.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wizTemplate.xhtml	24 Feb 2007 08:13:56 -0000	1.6
--- wizTemplate.xhtml	12 Mar 2007 08:46:38 -0000	1.7
***************
*** 29,44 ****
  	<script language="JavaScript" type="text/javascript">
  	 // <![CDATA[
! 	        $('#{menu.elementLabel}').setAttribute( 'currentStep', 0 );
! 	        $('#{menu.elementLabel}').setAttribute( 'lastStep', 0 );
! 	        setupWizSteps('#{menu.elementLabel}', 1);
  	  // ]]>
  	</script>
  
! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit2(this);closeTab('#{menu.element}');return false;">
  	<div class="infobar" >
  		<table width="100%">
  		  <tbody>
  			  <tr>
! 			    <td width="30%" class="name">#{subject}</td>
  			    <td width="34%" class="infotitle">#{title}</td>
  			    <td width="30%" class="author">Template provided by #{author}</td>
--- 29,48 ----
  	<script language="JavaScript" type="text/javascript">
  	 // <![CDATA[
!         $('#{menu.elementLabel}').setAttribute( 'currentStep', 0 );
!         $('#{menu.elementLabel}').setAttribute( 'lastStep', 0 );
!         setupWizSteps('#{menu.elementLabel}', 1);
!         $('#{menu.elementLabel}form').setAttribute( 'tolvenid', '#{menu.element}' );
! //        $('#{menu.elementLabel}form').setAttribute( 'submitButton', '#{menu.elementLabel}submitButton' );
! 		new Form.Observer( '#{menu.elementLabel}form', 1, wizUpload );
! //        alert( "Observer setup for: " + $('#{menu.elementLabel}form').getAttribute( 'tolvenid' ) );
  	  // ]]>
  	</script>
  
! <h:form id="#{menu.elementLabel}form" onsubmit="ajaxSubmit3(this, '#{menu.element}');return false;">
  	<div class="infobar" >
  		<table width="100%">
  		  <tbody>
  			  <tr>
! 			    <td width="30%" class="name">#{subject} </td>
  			    <td width="34%" class="infotitle">#{title}</td>
  			    <td width="30%" class="author">Template provided by #{author}</td>
***************
*** 76,92 ****
  	
  	<div class="navbar">
! 		<table width="100%">
! 			<tr>
! 				<td align="center" >
! 					<input id="#{menu.elementLabel}stopButton" type="submit" value="Stop" style="display:none"/>
! 					<input id="#{menu.elementLabel}prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/>
! 					<input id="#{menu.elementLabel}nextButton" type="submit" value="Next"  onclick="nextStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/>
! 				</td>
! 			</tr>
! 		</table>
  	</div>
  </h:form>
  </div>
!     </ui:composition>
  </body>
  </html>
\ No newline at end of file
--- 80,100 ----
  	
  	<div class="navbar">
! 		<c:if test="#{menu.menuDataItem.status=='NEW'}">
! 			<table width="100%">
! 				<tr>
! 					<td align="center">
! 			            <h:commandButton action="#{trim.upload}" value="Upload" style="display:none"/>
! 						<input id="#{menu.elementLabel}cancelButton" type="submit" value="Cancel" onclick="wizCancel('#{menu.element}');"/>
! 						<input id="#{menu.elementLabel}prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/>
! 						<input id="#{menu.elementLabel}nextButton" type="submit" value="Next"  onclick="nextStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/>
! 						<input id="#{menu.elementLabel}submitButton" type="submit" value="Submit"  onclick="wizSubmit('#{menu.element}');"/>
! 					</td>
! 				</tr>
! 			</table>
! 		</c:if>
  	</div>
  </h:form>
  </div>
! </ui:composition>
  </body>
  </html>
\ No newline at end of file

--- NEW FILE: weight.xhtml ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:f="http://java.sun.com/jsf/core"
      xmlns:h="http://java.sun.com/jsf/html"
      xmlns:c="http://java.sun.com/jstl/core">
<head>
    <title>Patient Weight</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition>
		<c:if test="#{menu.menuDataItem.status=='NEW'}">
			<div class="step" title="Getting Started - #{menu.menuDataItem.string01}" >
				<div class="pagesm">
					<p>How to enter your weight</p>
					<p>In this form you will enter your weight. Take your shoes off. Weight yourself.</p>
					<p>Click the next button to enter your weight.</p>
					[Tolven Page: #{trim.trim.page}]
				</div>
				<div class="help" id="#{menu.elementLabel}help1" style="display:none">
					<h1>getting Started</h1>
					<p>Help provides additional information about each page</p>
					<p>You can close this form by clicking the [x] above at any time. The form will remain in your list of new activity so that yuo can continue at any time later.
					If you want to completely cancel the form prior to submission, removing all traces of the form from the system, click the Cancel button.
					Once submitted, you will not be able to Cancel the form.</p>
				</div>
			</div>
			<div class="step" title="Enter #{menu.menuDataItem.string01}" >
				<div class="pagesm">
					Test: #{menu.menuDataItem.string01} <br/>
					Date of observation: <br/>
					<ui:include src="/wizard/datetime.xhtml">
						<ui:param name="ts" value="#{trim.trim.act.effectiveTime.TS[0]}"/>
					</ui:include><br/>
					#{menu.menuDataItem.string01} <h:inputText id="val" value="#{trim.trim.act.observation.value.PQS[0].value}"/> #{trim.trim.act.observation.value.PQS[0].unit}<br/>
				</div>
				<div class="help" id="#{menu.elementLabel}help2" style="display:none">
					<h1>Weight</h1>
					<p>Holding your breath doesn't help much.</p>
				</div>
			</div>
			<div class="step" title="Finalize" >
				<div id="#{menu.element}:drilldown">
					Waiting for server...
				</div>
			</div>
		</c:if>
		<c:if test="#{menu.menuDataItem.status!='NEW'}">
			<ui:include src="/five/drilldown/weightDD.xhtml">
				<ui:param name="act" value="#{trim.trim.act}"/>
			</ui:include>
		</c:if>
	</ui:composition>
</body>
</html>
--- NEW FILE: datetime.xhtml ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
      xmlns:ui="http://java.sun.com/jsf/facelets"
      xmlns:f="http://java.sun.com/jsf/core"
      xmlns:h="http://java.sun.com/jsf/html"
      xmlns:c="http://java.sun.com/jstl/core">
<head>
    <title>Date fields</title>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
</head>

<body>
    <ui:composition>
		<h:inputText id="#{menu.elementLabel}gcsT" value="#{ts}" size="30"/><br/>
		<a href="javascript:addHours('#{menu.elementLabel}gcsT',-1);">-1h</a>
		<a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-10);">-10m</a>
		<a href="javascript:addMinutes('#{menu.elementLabel}gcsT',-1);">-1m</a>
		<a href="javascript:setNow('#{menu.elementLabel}gcsT');">now</a>
		<a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 1);">+1m</a>
		<a href="javascript:addMinutes('#{menu.elementLabel}gcsT', 10);">+10m</a>
		<a href="javascript:addHours('#{menu.elementLabel}gcsT', 1);">+1h</a>
	</ui:composition>
</body>
</html>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/ajax InstantiateServlet.java, 1.3, 1.4

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

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

Modified Files:
	InstantiateServlet.java 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

Index: InstantiateServlet.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/InstantiateServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantiateServlet.java	8 Mar 2007 17:03:43 -0000	1.3
--- InstantiateServlet.java	12 Mar 2007 08:46:39 -0000	1.4
***************
*** 4,27 ****
  import java.io.Writer;
  import java.util.Date;
- import java.util.HashMap;
- import java.util.Map;
  
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
- import javax.servlet.Servlet;
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
- import javax.servlet.ServletRequest;
- import javax.servlet.ServletResponse;
  import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
- import javax.transaction.HeuristicMixedException;
- import javax.transaction.HeuristicRollbackException;
- import javax.transaction.NotSupportedException;
- import javax.transaction.RollbackException;
- import javax.transaction.SystemException;
- import javax.transaction.UserTransaction;
  import javax.xml.bind.JAXBException;
  
--- 4,16 ----
***************
*** 29,44 ****
  import org.tolven.app.CreatorLocal;
  import org.tolven.app.MenuLocal;
- import org.tolven.app.bean.MenuPath;
  import org.tolven.app.entity.MenuData;
  import org.tolven.core.entity.AccountUser;
  import org.tolven.doc.DocumentLocal;
! import org.tolven.gen.PersonGenerator;
  import org.tolven.trim.util.TRIMException;
- import org.tolven.voc.umls.ConceptDAO;
- import org.tolven.web.TopAction;
  
  public class InstantiateServlet extends HttpServlet {
      private CreatorLocal creatorBean;
!     private MenuLocal menuLocal;
  
      private ServletContext context = null;
--- 18,34 ----
  import org.tolven.app.CreatorLocal;
  import org.tolven.app.MenuLocal;
  import org.tolven.app.entity.MenuData;
  import org.tolven.core.entity.AccountUser;
+ import org.tolven.core.entity.Status;
  import org.tolven.doc.DocumentLocal;
! import org.tolven.doc.XMLLocal;
! import org.tolven.doc.entity.DocBase;
  import org.tolven.trim.util.TRIMException;
  
  public class InstantiateServlet extends HttpServlet {
      private CreatorLocal creatorBean;
!     private MenuLocal menuBean;
!     private DocumentLocal docBean;
!     private XMLLocal xmlBean;
  
      private ServletContext context = null;
***************
*** 53,57 ****
             InitialContext ctx = new InitialContext();
             creatorBean = (CreatorLocal) ctx.lookup("tolven/CreatorBean/local");
!            menuLocal = (MenuLocal) ctx.lookup("tolven/MenuBean/local");
          }
          catch (NamingException e)
--- 43,49 ----
             InitialContext ctx = new InitialContext();
             creatorBean = (CreatorLocal) ctx.lookup("tolven/CreatorBean/local");
!            menuBean = (MenuLocal) ctx.lookup("tolven/MenuBean/local");
!            docBean = (DocumentLocal) ctx.lookup("tolven/DocumentBean/local");
!            xmlBean = (XMLLocal) ctx.lookup("tolven/XMLBean/local");
          }
          catch (NamingException e)
***************
*** 78,82 ****
  
  	    //	    writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" );
! 	
  	    // Instantiation request from browser
  	    if (uri.endsWith("instantiate.ajaxi")) {
--- 70,122 ----
  
  	    //	    writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" );
! 
!     	/**
!     	 * We have the data, now just submit to make it actionable.
!     	 */
! 	    if (uri.endsWith("wizSubmit.ajaxi")) {
! 			String element = req.getParameter( "element");
! 			MenuData md  = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element);
!     		if (md.getStatus()==Status.NEW) {
!     			creatorBean.submit(md);
!         		// Confirm by returning the path of the element we submitted. (path==element)
!     	    	writer.write(md.getPath());
!     		}
! 			writer.close();
! 			return;
!     	}
! 
!     	/**
!     	 * In this sense, cancel means to delete the in-process document - we can remove all traces
!     	 * since the document was not yet actionable so no audit is needed.
!     	 */
! 	    if (uri.endsWith("wizCancel.ajaxi")) {
! 			String element = req.getParameter( "element");
! //			MenuPath path = new MenuPath( element );
! //			System.out.println( "Milestone 1" );
! 			MenuData md  = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element);
! //			System.out.println( "Milestone 2" );
!     		if (md.getStatus()==Status.NEW) {
!     			menuBean.removeReferencingMenuData( md.getAccount().getId(), md.getDocumentId());
!     		}
! //			System.out.println( "Milestone 3" );
!     		// Confirm by returning the path of the element we deleted. (path==element)
! 	    	writer.write(md.getPath());
! 			writer.close();
! 			return;
!     	}
! 
!     	// Browser requests TRIM XML
! 	    if (uri.endsWith("trimGet.ajaxi")) {
! //		    writer.write( "<element>" );
! 	    	// The MenuStructureItem to use
! 			String element = req.getParameter( "element");
! 			if (element == null ) throw new IllegalArgumentException( "Missing element in TRIM request");
! 			MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element);
! 			DocBase doc = docBean.findDocument( md.getDocumentId());
! 			writer.write(doc.getContentString());
! 			writer.close();
! 			return;
! 	    }
! 
  	    // Instantiation request from browser
  	    if (uri.endsWith("instantiate.ajaxi")) {
***************
*** 90,97 ****
  			MenuData md;
  			md = creatorBean.createTRIMInstance(accountUser.getAccount().getId(), templateId, context, now );
! 	    	writer.write(md.getPath());
  //		    writer.write( "</element>" );
  			writer.close();
! //			ut.commit();
  	    }
  	} catch (JAXBException e) {
--- 130,137 ----
  			MenuData md;
  			md = creatorBean.createTRIMInstance(accountUser.getAccount().getId(), templateId, context, now );
! 			writer.write(md.getPath());
  //		    writer.write( "</element>" );
  			writer.close();
! 			return;
  	    }
  	} catch (JAXBException e) {
***************
*** 102,108 ****
  		throw new ServletException( "Exception thrown in IntantiateServlet", e);
  	}
- 
  }
  
  
  }
--- 142,168 ----
  		throw new ServletException( "Exception thrown in IntantiateServlet", e);
  	}
  }
  
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ 	String uri = request.getRequestURI();
+ 	AccountUser accountUser = (AccountUser) request.getAttribute("accountUser");
+ 	response.setContentType("text/xml");
+ 	response.setHeader("Cache-Control", "no-cache");
+     Writer writer=response.getWriter();
+ 	Date now = (Date) request.getAttribute("tolvenNow");
+ 
+ 	// Browser puts TRIM XML
+     if (uri.endsWith("trimPut.ajaxi")) {
+ //		    writer.write( "<element>" );
+     	// The MenuStructureItem to use
+ 		String element = request.getParameter( "element");
+ 		if (element == null ) throw new IllegalArgumentException( "Missing element in TRIM request");
+ 		MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element);
+ 		DocBase doc = docBean.findDocument( md.getDocumentId());
+ 		request.getInputStream();
+ //			    writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<html>\n" +
+ 	}
+ }
  
  }

[Tolven-cvs-commit] tolvenWEB/web/invitation newPatient.xhtml, 1.1, 1.2

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

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

Added Files:
	newPatient.xhtml 
Log Message:
Major aspects of Data Entry complete, with rules, and synchronous background submission. only Weight form actually works and then it is very preliminary.

--- NEW FILE: newPatient.xhtml ---
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
    xmlns:ui="http://java.sun.com/jsf/facelets"
    xmlns:f="http://java.sun.com/jsf/core"
    xmlns:h="http://java.sun.com/jsf/html"
    xmlns:c="http://java.sun.com/jstl/core">
    <body>
      <ui:composition template="/templates/invitationTemplate.xhtml">
       <ui:define name="invitationBody">
        <p>X has requested to become a patient of Y.
        yes
        no + reason.
        </p>
       </ui:define>
      </ui:composition>
    </body>
</html>