Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/WEB-INF Modified Files: faces-config.xml Log Message: Revised Account and User preferences pages Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** faces-config.xml 12 Mar 2007 08:46:38 -0000 1.41 --- faces-config.xml 24 Mar 2007 15:27:27 -0000 1.42 *************** *** 11,14 **** --- 11,21 ---- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> <el-resolver>org.tolven.web.PathELResolver</el-resolver> + <!-- <message-bundle></message-bundle> --> + <locale-config> + <default-locale>en</default-locale> + <!-- <supported-locale></supported-locale> + <supported-locale></supported-locale> + --> + </locale-config> </application> <!-- converter --> *************** *** 39,44 **** <from-view-id>/*</from-view-id> <navigation-case> ! <from-outcome>adminAccount</from-outcome> ! <to-view-id>/manage/adminAccount.xhtml</to-view-id> </navigation-case> <navigation-case> --- 46,51 ---- <from-view-id>/*</from-view-id> <navigation-case> ! <from-outcome>userPrefs</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> </navigation-case> <navigation-case> *************** *** 61,65 **** <navigation-case> <from-outcome>deleteUser</from-outcome> ! <to-view-id>/private/deleteUser.xhtml</to-view-id> </navigation-case> </navigation-rule> --- 68,72 ---- <navigation-case> <from-outcome>deleteUser</from-outcome> ! <to-view-id>/manage/deleteUser.xhtml</to-view-id> </navigation-case> </navigation-rule> *************** *** 103,130 **** Account Administration </description> ! <from-view-id>/manage/adminAccount.xhtml</from-view-id> ! <navigation-case> ! <from-outcome>edit</from-outcome> ! <to-view-id>/manage/editProfile.xhtml</to-view-id> ! <redirect/> ! </navigation-case> <navigation-case> ! <from-outcome>control</from-outcome> ! <to-view-id>/manage/controlAccess.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> ! <from-outcome>sponsor</from-outcome> ! <to-view-id>/manage/addSponsor.xhtml</to-view-id> <redirect/> </navigation-case> - <navigation-case> - <from-outcome>cancel</from-outcome> - <to-view-id>/private/dispatch.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>fail</from-outcome> - <to-view-id>/manage/adminAccount.xhtml</to-view-id> - </navigation-case> <navigation-case> <from-outcome>dispatch</from-outcome> --- 110,124 ---- Account Administration </description> ! <from-view-id>/manage/userPrefs.xhtml</from-view-id> <navigation-case> ! <from-outcome>editUser</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> ! <from-outcome>editAccount</from-outcome> ! <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-outcome>dispatch</from-outcome> *************** *** 133,192 **** </navigation-case> </navigation-rule> ! <navigation-rule> ! <description> ! Edit Account Title or Timezone ! </description> ! <from-view-id>/manage/editProfile.xhtml</from-view-id> ! <navigation-case> <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> ! <redirect/> ! </navigation-case> ! <navigation-case> ! <from-outcome>dispatch</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> ! </navigation-rule> ! ! <navigation-rule> ! <description> ! Control User Access to Accounts ! </description> ! <from-view-id>/manage/controlAccess.xhtml</from-view-id> <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/adminAccount.xhtml</to-view-id> </navigation-case> <navigation-case> - <from-action>#{reg.updateAccount}</from-action> - <from-outcome>success</from-outcome> - <to-view-id>/private/dispatch.xhtml</to-view-id> - <redirect/> - </navigation-case> - <navigation-case> <from-action>#{gen.createCHRPatients}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/adminAccount.xhtml</to-view-id> </navigation-case> <navigation-case> - <from-outcome>dispatch</from-outcome> - <to-view-id>/private/dispatch.xhtml</to-view-id> - <redirect/> - </navigation-case> - </navigation-rule> - - <navigation-rule> - <description> - Add Sponsorships - </description> - <from-view-id>/manage/addSponsor.xhtml</from-view-id> - <navigation-case> <from-action>#{reg.addSponsorship}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/addSponsor.xhtml</to-view-id> </navigation-case> <navigation-case> --- 127,156 ---- </navigation-case> </navigation-rule> ! <navigation-rule> ! <description> ! Edit Account Preferences ! </description> ! <from-view-id>/manage/editAccountProfile.xhtml</from-view-id> ! <navigation-case> <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> <redirect/> ! </navigation-case> <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{gen.createCHRPatients}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> </navigation-case> <navigation-case> <from-action>#{reg.addSponsorship}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editAccountProfile.xhtml</to-view-id> </navigation-case> <navigation-case> *************** *** 196,220 **** </navigation-case> </navigation-rule> ! <navigation-rule> <description> ! User Preferences </description> ! <from-view-id>/private/sponsoredUsers.xhtml</from-view-id> <navigation-case> <from-outcome>close</from-outcome> ! <to-view-id>/manage/adminAccount.xhtml</to-view-id> <redirect/> </navigation-case> </navigation-rule> <navigation-rule> <description> ! User Preferences </description> ! <from-view-id>/private/userDemog.xhtml</from-view-id> <navigation-case> <from-action>#{reg.updatePrefs}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> --- 160,185 ---- </navigation-case> </navigation-rule> ! <navigation-rule> <description> ! Sponsored Users </description> ! <from-view-id>/manage/sponsoredUsers.xhtml</from-view-id> <navigation-case> <from-outcome>close</from-outcome> ! <to-view-id>/manage/userPrefs.xhtml</to-view-id> <redirect/> </navigation-case> </navigation-rule> + <navigation-rule> <description> ! Edit User Preferences </description> ! <from-view-id>/manage/editUserProfile.xhtml</from-view-id> <navigation-case> <from-action>#{reg.updatePrefs}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> *************** *** 222,242 **** <from-action>#{reg.sendTestMessage}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> ! <from-outcome>error</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> ! </navigation-case> ! <navigation-case> ! <from-outcome>cancel</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> ! <navigation-case> ! <from-outcome>photo</from-outcome> ! <to-view-id>/private/prefPhotos.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> --- 187,204 ---- <from-action>#{reg.sendTestMessage}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> ! <from-action>#{reg.updateAccount}</from-action> ! <from-outcome>success</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> </navigation-case> ! <navigation-case> ! <from-outcome>dispatch</from-outcome> ! <to-view-id>/private/dispatch.xhtml</to-view-id> <redirect/> ! </navigation-case> </navigation-rule> *************** *** 249,253 **** <from-action>#{reg.selectAsLikeness}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> <redirect/> </navigation-case> --- 211,215 ---- <from-action>#{reg.selectAsLikeness}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> *************** *** 259,266 **** <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> <redirect/> </navigation-case> </navigation-rule> <navigation-rule> <description> --- 221,234 ---- <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/manage/editUserProfile.xhtml</to-view-id> <redirect/> </navigation-case> + <navigation-case> + <from-outcome>dispatch</from-outcome> + <to-view-id>/private/dispatch.xhtml</to-view-id> + <redirect/> + </navigation-case> </navigation-rule> + <navigation-rule> <description> *************** *** 394,401 **** <navigation-rule> ! <from-view-id>/private/deleteUser.xhtml</from-view-id> <navigation-case> <from-outcome>cancel</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> </navigation-case> </navigation-rule> --- 362,370 ---- <navigation-rule> ! <from-view-id>/manage/deleteUser.xhtml</from-view-id> <navigation-case> <from-outcome>cancel</from-outcome> <to-view-id>/private/dispatch.xhtml</to-view-id> + <redirect/> </navigation-case> </navigation-rule> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/src/org/tolven/web Modified Files: RegisterAction.java Log Message: Revised Account and User preferences pages Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** RegisterAction.java 20 Mar 2007 09:13:43 -0000 1.47 --- RegisterAction.java 24 Mar 2007 15:27:27 -0000 1.48 *************** *** 15,21 **** --- 15,23 ---- import java.io.IOException; import java.util.ArrayList; + import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.TimeZone; + import java.util.Locale; import javax.faces.application.FacesMessage; *************** *** 31,34 **** --- 33,37 ---- import org.apache.commons.fileupload.FileItem; import org.tolven.app.MenuLocal; + import org.tolven.app.entity.MSColumn; import org.tolven.core.AccountDAOLocal; import org.tolven.core.ActivationLocal; *************** *** 67,71 **** private Generator chrGen; - private TolvenPerson tp; private String repeatUid; --- 70,73 ---- *************** *** 103,107 **** private List<SelectItem> timeZones; ! // Search Criteria private String searchCriteria; --- 105,110 ---- private List<SelectItem> timeZones; ! public List<SelectItem> localesList; ! // Search Criteria private String searchCriteria; *************** *** 115,119 **** // A list of all accounts this user is a member of private List<AccountUser> userAccounts; ! // a list of all users for an account private List<AccountUser> accountUsers; --- 118,122 ---- // A list of all accounts this user is a member of private List<AccountUser> userAccounts; ! // A list of all users for an account private List<AccountUser> accountUsers; *************** *** 737,741 **** } ! public boolean isReferenceRequired() throws IOException { if (referenceRequired==null) { --- 740,781 ---- } ! public List<SelectItem> getLocalesList() { ! Locale list[] = Locale.getAvailableLocales(); ! localesList = new ArrayList<SelectItem>(); ! ! //Add "default" as en_US at the top of the list ! //The leading space is used so that it doesn't get messed up in the sorting. ! localesList.add(new SelectItem("en_US", " Use Default")); ! for (Locale userLocale : list) { ! String localeDesc; ! String localeCode = userLocale.toString(); ! if (userLocale.getCountry() == "") { ! localeDesc = userLocale.getDisplayLanguage() + " (" + userLocale.getLanguage() + ")"; ! } else { ! localeDesc = userLocale.getDisplayLanguage() + " - " + userLocale.getDisplayCountry() + " (" + userLocale.getLanguage() + "_" + userLocale.getCountry() + ")"; ! } ! ! //This list is unsorted ! localesList.add(new SelectItem(localeCode, localeDesc)); ! } ! ! //Create a comparator for locale display language-country pairs ! class LabelSort implements Comparator { ! ! public int compare(Object o1, Object o2) { ! SelectItem localeLabel1 = (SelectItem) o1; ! SelectItem localeLabel2 = (SelectItem) o2; ! if (localeLabel1.getLabel().equals(localeLabel2.getLabel())) return 0; ! if (localeLabel1.getLabel().compareTo(localeLabel2.getLabel()) < 0) return -1; ! return 1; ! } ! ! } ! ! //Sorted list ! java.util.Collections.sort(localesList, new LabelSort()); ! return localesList; ! } ! public boolean isReferenceRequired() throws IOException { if (referenceRequired==null) { |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:35
|
Update of /cvsroot/tolven/tolvenWEB/web/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/templates Modified Files: baseWizard.xhtml baseTemplate.xhtml mailTemplate.xhtml portalTemplate.xhtml Log Message: Revised Account and User preferences pages Index: mailTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/mailTemplate.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mailTemplate.xhtml 22 Jun 2006 00:23:16 -0000 1.1 --- mailTemplate.xhtml 24 Mar 2007 15:27:27 -0000 1.2 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <f:attribute name="contentType" value="text/html"/> ! <f:attribute name="charset" value="utf-8"/> <head> <style> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <f:attribute name="contentType" value="text/html"/> ! <f:attribute name="charset" value="UTF-8"/> <head> <style> Index: baseTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/baseTemplate.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** baseTemplate.xhtml 16 Jan 2007 06:47:22 -0000 1.2 --- baseTemplate.xhtml 24 Mar 2007 15:27:27 -0000 1.3 *************** *** 7,11 **** <!-- InstanceBegin template="/Templates/BasePortal.dwt" codeOutsideHTMLIsLocked="false" --> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <!-- InstanceBeginEditable name="doctitle" --> <title>#{pageTitle}</title> --- 7,11 ---- <!-- InstanceBegin template="/Templates/BasePortal.dwt" codeOutsideHTMLIsLocked="false" --> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <!-- InstanceBeginEditable name="doctitle" --> <title>#{pageTitle}</title> Index: baseWizard.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/baseWizard.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** baseWizard.xhtml 22 Jun 2006 00:23:16 -0000 1.1 --- baseWizard.xhtml 24 Mar 2007 15:27:27 -0000 1.2 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <!-- TemplateBeginEditable name="doctitle" --> <title>Untitled Document</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <!-- TemplateBeginEditable name="doctitle" --> <title>Untitled Document</title> Index: portalTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/portalTemplate.xhtml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** portalTemplate.xhtml 5 Mar 2007 19:12:18 -0000 1.20 --- portalTemplate.xhtml 24 Mar 2007 15:27:27 -0000 1.21 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Tolven Portal</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Tolven Portal</title> *************** *** 49,55 **** <td class="user"> <h:outputText value="#{top.accountTitle} "/> - <h:commandLink action="adminAccount" rendered="#{top.accountAdmin}"> - <h:outputText styleClass="smallText" value=" [Admin]" /> - </h:commandLink> </td> </tr> --- 49,52 ---- *************** *** 67,71 **** <li><a href="#">Help</a></li> <h:panelGroup rendered="#{top.accountUserId!=0}"> ! <li><a href="#{facesContext.externalContext.request.contextPath}/private/userDemog.jsf">Preferences</a></li> <li><a href="customize.jsf?accountUserId=#{top.accountUserId}">Customize</a></li> </h:panelGroup> --- 64,68 ---- <li><a href="#">Help</a></li> <h:panelGroup rendered="#{top.accountUserId!=0}"> ! <li><a href="#{facesContext.externalContext.request.contextPath}/manage/userPrefs.jsf">Preferences</a></li> <li><a href="customize.jsf?accountUserId=#{top.accountUserId}">Customize</a></li> </h:panelGroup> |
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/private Modified Files: prefPhotos.xhtml createAccount.xhtml selectAccount.xhtml customize.xhtml Removed Files: userDemog.xhtml deleteUser.xhtml sponsoredUsers.xhtml Log Message: Revised Account and User preferences pages Index: prefPhotos.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/prefPhotos.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** prefPhotos.xhtml 5 Mar 2007 19:12:18 -0000 1.6 --- prefPhotos.xhtml 24 Mar 2007 15:27:26 -0000 1.7 *************** *** 15,21 **** <div> <h2>Select a photo to be used as your likeness</h2> ! <p>The likeness you select can be seen by others when you send them a link to your data. ! It is not publically available. If you prefer not to have any photo likeness shown, click <i>No photo</i> below. ! Other photos in this list remain private to your account (subaccount).</p> <h:form id="photoSel"> <h:dataTable value="#{doc.photos}" var="p" > --- 15,24 ---- <div> <h2>Select a photo to be used as your likeness</h2> ! <p>You may upload as many pictures as you want, and store them privately in your account. ! From among those, you may choose one picture to represent your likeness (or choose "No Photo"). ! The picture you choose, if any, can be seen by others when you send them a link to your data; ! it is not publicly available. Click the picture of your choice as your likeness, or click the link ! <u>"No Photo"</u> below if you don't want to choose a picture at this time. ! All photos, except the likeness you choose, in this list remain private to your account.</p> <h:form id="photoSel"> <h:dataTable value="#{doc.photos}" var="p" > *************** *** 46,49 **** --- 49,56 ---- </h:commandLink> <h:commandButton action="cancel" immediate="true" value="Return"/> + <h:outputText value=" | | | " /> + <h:commandLink action="cancel" immediate="true" value="Return to Profile" /> + <h:outputText value=" | | " /> + <h:commandLink action="dispatch" immediate="true" value="Return to Application" /> </h:form> <form id="uploadForm" method="post" enctype="multipart/form-data" --- sponsoredUsers.xhtml DELETED --- --- deleteUser.xhtml DELETED --- Index: customize.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/customize.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** customize.xhtml 6 Nov 2006 07:41:30 -0000 1.5 --- customize.xhtml 24 Mar 2007 15:27:26 -0000 1.6 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** selectAccount.xhtml 6 Nov 2006 07:41:30 -0000 1.17 --- selectAccount.xhtml 24 Mar 2007 15:27:26 -0000 1.18 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: createAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/createAccount.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** createAccount.xhtml 29 Nov 2006 01:34:20 -0000 1.4 --- createAccount.xhtml 24 Mar 2007 15:27:26 -0000 1.5 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> --- userDemog.xhtml DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:27
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/five Modified Files: login.xhtml Log Message: Revised Account and User preferences pages Index: login.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/login.xhtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** login.xhtml 25 Feb 2007 00:55:27 -0000 1.11 --- login.xhtml 24 Mar 2007 15:27:26 -0000 1.12 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Tolven Login</title> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Cache-Control" content="no-cache" /> <title>Tolven Login</title> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:27
|
Update of /cvsroot/tolven/tolvenWEB/web/dataGrid In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/dataGrid Modified Files: loaderControlDG.xhtml Log Message: Revised Account and User preferences pages Index: loaderControlDG.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/dataGrid/loaderControlDG.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** loaderControlDG.xhtml 22 Jun 2006 00:23:17 -0000 1.1 --- loaderControlDG.xhtml 24 Mar 2007 15:27:26 -0000 1.2 *************** *** 1,3 **** ! <?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <f:view xmlns="http://www.w3.org/1999/xhtml" --- 1,3 ---- ! <?xml version=\"1.0\" encoding=\"UTF-8\"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <f:view xmlns="http://www.w3.org/1999/xhtml" |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:27
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/five/drilldown Modified Files: weightDD.xhtml Log Message: Revised Account and User preferences pages Index: weightDD.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/drilldown/weightDD.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weightDD.xhtml 12 Mar 2007 08:46:38 -0000 1.2 --- weightDD.xhtml 24 Mar 2007 15:27:25 -0000 1.3 *************** *** 7,11 **** <head> <title>Patient Weight - Drilldown</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>Patient Weight - Drilldown</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> |
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/wizard Modified Files: weight.xhtml bccIntake.xhtml datetime.xhtml gcs.xhtml newPatient.xhtml wizTemplate.xhtml observation.xhtml Log Message: Revised Account and User preferences pages Index: observation.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/observation.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** observation.xhtml 12 Mar 2007 08:46:38 -0000 1.3 --- observation.xhtml 24 Mar 2007 15:27:25 -0000 1.4 *************** *** 7,11 **** <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wizTemplate.xhtml 20 Mar 2007 19:53:08 -0000 1.8 --- wizTemplate.xhtml 24 Mar 2007 15:27:25 -0000 1.9 *************** *** 6,10 **** xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="cache-control" content="no-cache"/> --- 6,10 ---- xmlns:c="http://java.sun.com/jstl/core"> <head> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="pragma" content="no-cache"/> <meta http-equiv="cache-control" content="no-cache"/> Index: datetime.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/datetime.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** datetime.xhtml 12 Mar 2007 08:46:38 -0000 1.2 --- datetime.xhtml 24 Mar 2007 15:27:25 -0000 1.3 *************** *** 7,11 **** <head> <title>Date fields</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>Date fields</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: gcs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/gcs.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gcs.xhtml 12 Mar 2007 08:46:38 -0000 1.6 --- gcs.xhtml 24 Mar 2007 15:27:25 -0000 1.7 *************** *** 7,11 **** <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/weight.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weight.xhtml 12 Mar 2007 08:46:38 -0000 1.2 --- weight.xhtml 24 Mar 2007 15:27:25 -0000 1.3 *************** *** 7,11 **** <head> <title>Patient Weight</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>Patient Weight</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: newPatient.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/newPatient.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newPatient.xhtml 30 Oct 2006 19:34:24 -0000 1.1 --- newPatient.xhtml 24 Mar 2007 15:27:25 -0000 1.2 *************** *** 7,11 **** <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: bccIntake.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/bccIntake.xhtml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bccIntake.xhtml 20 Mar 2007 19:53:08 -0000 1.6 --- bccIntake.xhtml 24 Mar 2007 15:27:25 -0000 1.7 *************** *** 7,11 **** <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>New Patient Wizard</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:27
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/src/org/tolven/ajax Modified Files: DocServlet.java InstantiateServlet.java AjaxServlet.java AsyncServlet.java Log Message: Revised Account and User preferences pages Index: InstantiateServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/InstantiateServlet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** InstantiateServlet.java 20 Mar 2007 09:13:44 -0000 1.5 --- InstantiateServlet.java 24 Mar 2007 15:27:25 -0000 1.6 *************** *** 72,76 **** Date now = (Date) req.getAttribute("tolvenNow"); ! // writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ); /** --- 72,76 ---- Date now = (Date) req.getAttribute("tolvenNow"); ! // writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ); /** *************** *** 165,169 **** DocBase doc = docBean.findDocument( md.getDocumentId()); request.getInputStream(); ! // writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<html>\n" + } } --- 165,169 ---- DocBase doc = docBean.findDocument( md.getDocumentId()); request.getInputStream(); ! // writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<html>\n" + } } Index: AsyncServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AsyncServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AsyncServlet.java 21 Aug 2006 00:20:06 -0000 1.3 --- AsyncServlet.java 24 Mar 2007 15:27:25 -0000 1.4 *************** *** 79,83 **** RenderKit renderKit = renderKitFactory.getRenderKit( null, RenderKitFactory.HTML_BASIC_RENDER_KIT ); ! // ResponseWriter responseWriter = renderKit.createResponseWriter(stringWriter, "text/html", "ISO-8859-1"); FacesContext facesContext = fcFactory.getFacesContext(ctx, req, wrappedResponse, lifecycle); --- 79,83 ---- RenderKit renderKit = renderKitFactory.getRenderKit( null, RenderKitFactory.HTML_BASIC_RENDER_KIT ); ! // ResponseWriter responseWriter = renderKit.createResponseWriter(stringWriter, "text/html", "UTF-8"); FacesContext facesContext = fcFactory.getFacesContext(ctx, req, wrappedResponse, lifecycle); Index: AjaxServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AjaxServlet.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AjaxServlet.java 8 Mar 2007 17:03:43 -0000 1.22 --- AjaxServlet.java 24 Mar 2007 15:27:25 -0000 1.23 *************** *** 158,162 **** resp.setHeader("Cache-Control", "no-cache"); Writer writer=resp.getWriter(); ! writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ); writer.write( "<ajax-response>\n" ); int offset = Integer.parseInt( req.getParameter( "offset")); --- 158,162 ---- resp.setHeader("Cache-Control", "no-cache"); Writer writer=resp.getWriter(); ! writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" ); writer.write( "<ajax-response>\n" ); int offset = Integer.parseInt( req.getParameter( "offset")); Index: DocServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/DocServlet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** DocServlet.java 20 Mar 2007 09:13:44 -0000 1.10 --- DocServlet.java 24 Mar 2007 15:27:25 -0000 1.11 *************** *** 125,129 **** docBean.finalizeDocument(doc); } ! // writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<html>\n" + writer.write( "<html>\n" + "<head>" + --- 125,129 ---- docBean.finalizeDocument(doc); } ! // writer.write( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<html>\n" + writer.write( "<html>\n" + "<head>" + |
|
From: John C. <jc...@us...> - 2007-03-24 15:27:27
|
Update of /cvsroot/tolven/tolvenWEB/web/private/admin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3935/web/private/admin Modified Files: updateAccountType.xhtml addAccountType.xhtml sysAdmin.xhtml index.xhtml Log Message: Revised Account and User preferences pages Index: addAccountType.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/admin/addAccountType.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** addAccountType.xhtml 6 Nov 2006 07:41:30 -0000 1.1 --- addAccountType.xhtml 24 Mar 2007 15:27:26 -0000 1.2 *************** *** 7,11 **** <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: index.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/admin/index.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.xhtml 6 Nov 2006 07:41:30 -0000 1.1 --- index.xhtml 24 Mar 2007 15:27:26 -0000 1.2 *************** *** 7,11 **** <head> <title>System Administration Home Page</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>System Administration Home Page</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: updateAccountType.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/admin/updateAccountType.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** updateAccountType.xhtml 6 Nov 2006 07:41:30 -0000 1.1 --- updateAccountType.xhtml 24 Mar 2007 15:27:26 -0000 1.2 *************** *** 7,11 **** <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> Index: sysAdmin.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/admin/sysAdmin.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sysAdmin.xhtml 6 Nov 2006 07:41:30 -0000 1.1 --- sysAdmin.xhtml 24 Mar 2007 15:27:26 -0000 1.2 *************** *** 7,11 **** <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> --- 7,11 ---- <head> <title>System Administration</title> ! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> |
|
From: John C. <jc...@us...> - 2007-03-24 15:04:21
|
Update of /cvsroot/tolven/tolvenEJB/resources/xsd In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11076/resources/xsd Modified Files: Tag: P_JC_DATAENTRY4 trim4-test5.xml trim4.xsd Log Message: <set instead of <default Index: trim4-test5.xml =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/Attic/trim4-test5.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** trim4-test5.xml 22 Mar 2007 22:50:35 -0000 1.1.2.1 --- trim4-test5.xml 24 Mar 2007 14:27:29 -0000 1.1.2.2 *************** *** 23,29 **** </title> <effectiveTime> ! <new datatype="TS" default="now"> <label language="en">Observation time</label> <input type="time"/> </new> </effectiveTime> --- 23,30 ---- </title> <effectiveTime> ! <new datatype="TS"> <label language="en">Observation time</label> <input type="time"/> + <set property="value" special="now"/> </new> </effectiveTime> *************** *** 45,49 **** <value> <PQ> ! <value></value> <unit>lb</unit> </PQ> --- 46,50 ---- <value> <PQ> ! <value>0.0</value> <unit>lb</unit> </PQ> Index: trim4.xsd =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** trim4.xsd 22 Mar 2007 22:50:35 -0000 1.3.4.1 --- trim4.xsd 24 Mar 2007 14:27:29 -0000 1.3.4.2 *************** *** 273,277 **** <xs:element name="label" type="NewFacetLabel" minOccurs="0"/> <xs:element name="input" type="NewFacetInput" minOccurs="0"/> ! <xs:element name="default" type="NewFacetDefault" minOccurs="0"/> <xs:element name="validate" type="NewFacetValidate" minOccurs="0"/> </xs:sequence> --- 273,277 ---- <xs:element name="label" type="NewFacetLabel" minOccurs="0"/> <xs:element name="input" type="NewFacetInput" minOccurs="0"/> ! <xs:element name="set" type="NewFacetSet" minOccurs="0"/> <xs:element name="validate" type="NewFacetValidate" minOccurs="0"/> </xs:sequence> *************** *** 303,309 **** </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"/> --- 303,310 ---- </xs:simpleContent> </xs:complexType> ! <xs:complexType name="NewFacetSet"> <xs:simpleContent> ! <xs:extension base="xs:string"> ! <xs:attribute name="property" type="cs" use="optional"/> <xs:attribute name="language" type="cs" use="optional"/> <xs:attribute name="special" type="xs:string" use="optional"/> |
|
From: John C. <jc...@us...> - 2007-03-22 22:52:31
|
Update of /cvsroot/tolven/tolvenClient In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26976 Modified Files: .classpath Removed Files: weight.trim glucose.trim bloodPressure.trim rash.trim pulse.trim temperature.trim bodyMassIndex.trim gcs.trim Log Message: Trim files moved to tolvenEJB --- pulse.trim DELETED --- --- temperature.trim DELETED --- Index: .classpath =================================================================== RCS file: /cvsroot/tolven/tolvenClient/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 28 Jan 2007 05:51:56 -0000 1.1 --- .classpath 22 Mar 2007 22:52:30 -0000 1.2 *************** *** 3,59 **** <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="lib" path="E:/tolvenWS/tolvenEJB/build/tolvenEJB.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/xmlsec.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/activation.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/antlr-2.7.6.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/avalon-framework.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/commons-httpclient.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/commons-logging.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/concurrent.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/ejb3-persistence.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/getopt.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/hibernate-annotations.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/hibernate-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jacorb.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/javassist.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/javax.servlet.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossall-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-annotations-ejb3.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-aop-jdk50-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-aspect-jdk50-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-common-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbosscx-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-deployment.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-ejb3-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-ejb3x.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossha-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-iiop-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-j2ee.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-jaxrpc.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossjmx-ant.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-jsr77-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossmq-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-remoting.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-saaj.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-serialization.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-srp-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbosssx-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-system-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-transaction-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossws-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-xml-binding.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jmx-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jmx-invoker-adaptor-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jnp-client.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/juddisaaj.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/log4j.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/logkit.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/mail.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/scout.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/trove.jar"/> ! <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/wsdl4j.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/hibernate3.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/cglib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --- 3,11 ---- <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jaxb"/> ! <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-client"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/hibernate3.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/cglib.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/tolvenEJB"/> <classpathentry kind="output" path="bin"/> </classpath> --- gcs.trim DELETED --- --- bloodPressure.trim DELETED --- --- weight.trim DELETED --- --- glucose.trim DELETED --- --- bodyMassIndex.trim DELETED --- --- rash.trim DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-22 22:51:10
|
Update of /cvsroot/tolven/tolvenEJB/src/test/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/src/test/rules Modified Files: Tag: P_JC_DATAENTRY4 RuleBaseTests.java Added Files: Tag: P_JC_DATAENTRY4 ccrexplode.drl testdata.ccr Log Message: Sync with HEAD Index: RuleBaseTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/rules/RuleBaseTests.java,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -C2 -d -r1.2 -r1.2.12.1 *** RuleBaseTests.java 16 Feb 2007 04:00:18 -0000 1.2 --- RuleBaseTests.java 22 Mar 2007 22:50:35 -0000 1.2.12.1 *************** *** 5,8 **** --- 5,14 ---- import java.io.Reader; import java.util.Date; + import java.util.HashMap; + + import javax.xml.bind.JAXBContext; + import javax.xml.bind.JAXBException; + import javax.xml.bind.Unmarshaller; + import javax.xml.transform.stream.StreamSource; import junit.framework.TestCase; *************** *** 15,18 **** --- 21,26 ---- import org.drools.compiler.PackageBuilderConfiguration; import org.drools.rule.Package; + import org.tolven.ccr.ContinuityOfCareRecord; + import org.tolven.doc.bean.XMLBean; import org.tolven.trim.Act; import org.tolven.trim.ActClass; *************** *** 98,101 **** --- 106,135 ---- } + public ContinuityOfCareRecord unmarshalCCR( String fileName ) throws Exception { + // String CCR_NS = "urn:astm-org:CCR"; + ClassLoader classLoader = ContinuityOfCareRecord.class.getClassLoader(); + assertFalse(classLoader==null ); + InputStream inputStream = classLoader.getResourceAsStream( fileName ); + + JAXBContext jc = JAXBContext.newInstance( "org.tolven.ccr", classLoader ); + Unmarshaller u = jc.createUnmarshaller(); + ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) u.unmarshal( inputStream ); + inputStream.close(); + return ccr; + } + + public void testRuleBase4( ) throws Exception { + System.out.println( "testRuleBase4 - assert a CCR object"); + // Read and unmarshal an XML file containing ccr + ContinuityOfCareRecord ccr = unmarshalCCR( "test/rules/testdata.ccr"); + // System.setProperty(RuleBaseConfiguration.PROPERTY_ASSERT_BEHAVIOR, RuleBaseConfiguration.WM_BEHAVIOR_EQUALITY ); + RuleBase ruleBase = openRuleBase("test/rules/ccrexplode.drl"); + //load up the rulebase + WorkingMemory workingMemory = ruleBase.newWorkingMemory(); + // Assert a trim object and see what the rules do with it + workingMemory.assertObject(ccr); + workingMemory.fireAllRules(); + workingMemory.dispose(); + } public RuleBase openRuleBase( String ruleFile) throws Exception { --- NEW FILE: ccrexplode.drl --- package org.tolven.rules import java.util.*; import org.tolven.ccr.*; /** * When a CCR document is processed, we first explode the document to include each of the types of elements * provided at the top level and at one level down in the body section. For example, each * ResultType is asserted but not the Tests contained within a result. Other rules will further decompose * such components. * In several cases, we need to create a simple wrapper since the classes used in CCR don't always * contain type information. For example, StructuredProductType does not independently identify * the purpose of the object (Medication, immunization, MedicalEquipment, etc). The wrapper works quite * well for rules which can then just select on the class itself rather than having to dig into the object * looking for types codes, etc (if such codes even existed). */ rule "ccr" when $ccr : ContinuityOfCareRecord($version : version == "V1.0") then System.out.println( "Found ccr version: " + $version + " Id: " + $ccr.getCCRDocumentObjectID()); assert( new PatientType( $ccr )); if ($ccr.getBody()!=null) { ContinuityOfCareRecord.Body body = $ccr.getBody(); if (body.getAlerts()!=null) { for (AlertType alert : body.getAlerts().getAlert()) assert( alert ); } if (body.getEncounters()!=null) { for (EncounterType encounter : body.getEncounters().getEncounter()) assert( encounter ); } if (body.getFamilyHistory()!=null) { for (FamilyHistoryType famHX : body.getFamilyHistory().getFamilyProblemHistory()) assert( famHX ); } if (body.getFunctionalStatus()!=null) { for (FunctionType functionalStatus : body.getFunctionalStatus().getFunction()) assert( functionalStatus ); } if (body.getHealthCareProviders()!=null) { for (ActorReferenceType provider : body.getHealthCareProviders().getProvider()) assert( new ProviderType($ccr, provider) ); } if (body.getImmunizations()!=null) { for (StructuredProductType imm : body.getImmunizations().getImmunization()) assert( new ImmunizationType(imm) ); } if (body.getMedicalEquipment()!=null) { for (StructuredProductType equip : body.getMedicalEquipment().getEquipment()) assert( new MedicalEquipmentType(equip) ); } if (body.getMedications()!=null) { for (StructuredProductType med : body.getMedications().getMedication()) assert( new MedicationType(med) ); } if (body.getPayers()!=null) { for (InsuranceType payer : body.getPayers().getPayer()) assert( payer ); } if (body.getPlanOfCare()!=null) { for (PlanType plan : body.getPlanOfCare().getPlan()) assert( plan ); } if (body.getProblems()!=null) { for (ProblemType problem : body.getProblems().getProblem()) assert( problem ); } if (body.getProcedures()!=null) { for (ProcedureType procedure : body.getProcedures().getProcedure()) assert( procedure ); } if (body.getResults()!=null) { for (ResultType result : body.getResults().getResult()) assert( result ); } if (body.getSocialHistory()!=null) { for (SocialHistoryType socialHistory : body.getSocialHistory().getSocialHistoryElement()) assert( socialHistory ); } if (body.getSupport()!=null) { for (ActorReferenceType support : body.getSupport().getSupportProvider()) assert( new SupportProviderType( $ccr, support) ); } if (body.getVitalSigns()!=null) { for (ResultType vs : body.getVitalSigns().getResult()) assert( new VitalSignType( vs) ); } } end rule "ccr patient" when $patient : PatientType() then System.out.println( "Found CCR patient actor: " + $patient.getActor().getPerson().getName().getCurrentName().getFamilyString() ); end rule "ccr alert" when $alert : AlertType( ) then System.out.println( "Found CCR alert: " + $alert.getDescriptionText() ); end rule "ccr problem" when $problem : ProblemType( ) then System.out.println( "Found CCR problem: " + $problem.getDescriptionText() ); end rule "ccr result" when $result : ResultType( ) then System.out.println( "Found CCR result: " + $result.getDescriptionText() ); // Assert the individual tests for (TestType test : $result.getTest()) { assert( test ); } end rule "ccr result - test" when $test : TestType( ) then System.out.println( "Found CCR test: " + $test.getDescriptionText() ); end --- NEW FILE: testdata.ccr --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <ContinuityOfCareRecord xmlns="urn:astm-org:CCR"> <CCRDocumentObjectID>2.16.840.1.113883.3.75.1174510903156.4</CCRDocumentObjectID> <Version>V1.0</Version> <Patient> <ActorID>AC000004</ActorID> </Patient> <Body> <Problems> <Problem> <DateTime> <Type> <Text>Date of Onset</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Problem</Text> </Type> <Description> <Text>Hay Fever</Text> </Description> <Status> <Text>Active</Text> </Status> </Problem> </Problems> <Alerts> <Alert> <DateTime> <Type> <Text>Start Date</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Allergy</Text> </Type> <Description> <Text>Ragweed</Text> </Description> <Status> <Text>Active</Text> </Status> </Alert> <Alert> <DateTime> <Type> <Text>Start Date</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Allergy</Text> </Type> <Description> <Text>Cedar Pollen</Text> </Description> <Status> <Text>Active</Text> </Status> </Alert> </Alerts> </Body> <Actors> <Actor> <ActorObjectID>AC000004</ActorObjectID> <Person> <Name> <CurrentName> <Given>Jonathon</Given> <Middle>Paul</Middle> <Family>Compton</Family> </CurrentName> </Name> <DateOfBirth> <ExactDateTime>1994-08-26T00:00:00-07:00</ExactDateTime> </DateOfBirth> <Gender> <Text>Male</Text> </Gender> </Person> <IDs> <Type> <Text>DemoPatient</Text> </Type> <ID>51538271</ID> </IDs> <Address> <Line1>4519 Charlton Drive</Line1> <City>ANCHORAGE</City> <State>AK</State> <Country>USA</Country> <PostalCode>99507</PostalCode> </Address> </Actor> </Actors> </ContinuityOfCareRecord> |
|
From: John C. <jc...@us...> - 2007-03-22 22:51:07
|
Update of /cvsroot/tolven/tolvenEJB/resources/xsd In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/resources/xsd Modified Files: Tag: P_JC_DATAENTRY4 trim4.xsd Added Files: Tag: P_JC_DATAENTRY4 trim4-test5.xml Log Message: Sync with HEAD --- NEW FILE: trim4-test5.xml --- <?xml version="1.0" encoding="UTF-8"?> <trim xmlns="urn:tolven-org:trim:4.0" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" 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/> <instance/> <documentId/> <element/> <instance/> <menu/> <act xsi:type="Act"> <classCode>OBS</classCode> <moodCode>EVN</moodCode> <id> <II extension="abc"/> <II extension="abc"/> <II extension="abc"/> </id> <code> <CD codeSystemName="UMLS" codeSystemVersion="2006AC" code="C0017594"/> </code> <title> <ST>Weight</ST> </title> <effectiveTime> <new datatype="TS" default="now"> <label language="en">Observation time</label> <input type="time"/> </new> </effectiveTime> <activityTime> <null>ASKU</null> </activityTime> <priorityCode> <CE code="123"> <originalText> <ST>My origianl text</ST> </originalText> </CE> <CE code="123"/> </priorityCode> <languageCode> <CE code="en"/> </languageCode> <observation> <value> <PQ> <value></value> <unit>lb</unit> </PQ> </value> </observation> <participation typeCode="SBJ"> <role xsi:type="RoleBind"> <classCode>PAT</classCode> <templateId>ephr:patient</templateId> </role> </participation> </act> </trim> Index: trim4.xsd =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** trim4.xsd 12 Mar 2007 08:47:13 -0000 1.3 --- trim4.xsd 22 Mar 2007 22:50:35 -0000 1.3.4.1 *************** *** 263,267 **** </xs:complexContent> </xs:complexType> - <xs:complexType name="Slot" abstract="true"> <xs:choice> --- 263,266 ---- *************** *** 270,278 **** </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"/> --- 269,276 ---- </xs:choice> </xs:complexType> ! <xs:complexType name="NewFacet"> <xs:sequence> <xs:element name="label" type="NewFacetLabel" minOccurs="0"/> ! <xs:element name="input" type="NewFacetInput" minOccurs="0"/> <xs:element name="default" type="NewFacetDefault" minOccurs="0"/> <xs:element name="validate" type="NewFacetValidate" minOccurs="0"/> *************** *** 280,284 **** <xs:attribute name="datatype" type="ConcreteDatatype"/> </xs:complexType> - <xs:complexType name="NewFacetLabel"> <xs:simpleContent> --- 278,281 ---- *************** *** 289,298 **** </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"> --- 286,298 ---- </xs:complexType> <xs:complexType name="NewFacetInput"> ! <xs:sequence> ! <xs:element name="validRange" type="ValidRange" minOccurs="0"/> ! </xs:sequence> ! <xs:attribute name="language" type="cs" use="optional"/> ! <xs:attribute name="type" type="cs" use="optional"/> ! </xs:complexType> ! <xs:complexType name="ValidRange"> ! <xs:attribute name="low" type="xs:double"/> ! <xs:attribute name="high" type="xs:double"/> </xs:complexType> <xs:complexType name="NewFacetValidate"> *************** *** 303,307 **** </xs:simpleContent> </xs:complexType> - <xs:complexType name="NewFacetDefault"> <xs:simpleContent> --- 303,306 ---- *************** *** 312,316 **** </xs:simpleContent> </xs:complexType> - <xs:complexType name="BLSlot"> <xs:complexContent> --- 311,314 ---- *************** *** 652,656 **** </xs:restriction> </xs:simpleType> - <xs:simpleType name="ConcreteDatatype"> <xs:restriction base="cs"> --- 650,653 ---- *************** *** 671,675 **** </xs:restriction> </xs:simpleType> - <xs:simpleType name="AddressPartType"> <xs:restriction base="cs"> --- 668,671 ---- |
|
From: John C. <jc...@us...> - 2007-03-22 22:51:06
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/src/org/tolven/gen/entity Modified Files: Tag: P_JC_DATAENTRY4 FamilyUnit.java FamilyMember.java Log Message: Sync with HEAD Index: FamilyMember.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity/FamilyMember.java,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -C2 -d -r1.4 -r1.4.12.1 *** FamilyMember.java 16 Jan 2007 06:12:47 -0000 1.4 --- FamilyMember.java 22 Mar 2007 22:50:35 -0000 1.4.12.1 *************** *** 58,62 **** StringBuffer sb = new StringBuffer(100); sb.append( getRole( )); sb.append( ": "); ! sb.append( getPerson( ).getFirst() + getPerson( ).getLast()); sb.append( ", "); return sb.toString(); } --- 58,66 ---- StringBuffer sb = new StringBuffer(100); sb.append( getRole( )); sb.append( ": "); ! sb.append( getPerson( ).getFirst()); sb.append( " "); ! sb.append( getPerson( ).getMiddle()); sb.append( " "); ! sb.append( getPerson( ).getLast()); sb.append( " "); ! sb.append( getPerson( ).getGender()); sb.append( " "); ! sb.append( getPerson( ).getFormattedDob()); sb.append( " "); return sb.toString(); } Index: FamilyUnit.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity/FamilyUnit.java,v retrieving revision 1.5 retrieving revision 1.5.12.1 diff -C2 -d -r1.5 -r1.5.12.1 *** FamilyUnit.java 16 Jan 2007 06:12:47 -0000 1.5 --- FamilyUnit.java 22 Mar 2007 22:50:35 -0000 1.5.12.1 *************** *** 68,76 **** { StringBuffer sb = new StringBuffer(100); ! sb.append( getFamilyName( )); sb.append( ": "); sb.append( getAddress( )); sb.append( ", "); sb.append( getCity( )); sb.append( ", "); sb.append( getState( )); sb.append( " "); sb.append( getZip( )); sb.append( " "); return sb.toString(); } --- 68,83 ---- { StringBuffer sb = new StringBuffer(100); ! sb.append("\n"); ! sb.append( getFamilyName( )); sb.append( " family at "); sb.append( getAddress( )); sb.append( ", "); sb.append( getCity( )); sb.append( ", "); sb.append( getState( )); sb.append( " "); sb.append( getZip( )); sb.append( " "); + sb.append("\n"); + for ( FamilyMember member: getMembers()) { + sb.append(" "); + sb.append(member.toString()); + sb.append("\n"); + } return sb.toString(); } |
|
From: John C. <jc...@us...> - 2007-03-22 22:50:40
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/src/org/tolven/gen/bean Modified Files: Tag: P_JC_DATAENTRY4 GenDriver.java Added Files: Tag: P_JC_DATAENTRY4 FamilyGenerator.java Log Message: Sync with HEAD Index: GenDriver.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenDriver.java,v retrieving revision 1.5 retrieving revision 1.5.12.1 diff -C2 -d -r1.5 -r1.5.12.1 *** GenDriver.java 12 Feb 2007 07:07:27 -0000 1.5 --- GenDriver.java 22 Mar 2007 22:50:39 -0000 1.5.12.1 *************** *** 37,44 **** import org.tolven.doc.XMLLocal; import org.tolven.doc.bean.TolvenMessage; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.model.GenMedicalCCR; - import org.tolven.gen.util.FamilyGenerator; /** * Control the Data Generator process. This process starts when a client queues a message to the --- 37,44 ---- import org.tolven.doc.XMLLocal; import org.tolven.doc.bean.TolvenMessage; + import org.tolven.gen.FamilyGeneratorLocal; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.model.GenMedicalCCR; /** * Control the Data Generator process. This process starts when a client queues a message to the *************** *** 70,73 **** --- 70,75 ---- @EJB private XMLLocal xmlBean; + @EJB private FamilyGeneratorLocal familyGen; + // private JAXBContext jc = null; // *************** *** 90,94 **** GenControlCHRAccount control = (GenControlCHRAccount) ((ObjectMessage)msg).getObject(); System.out.println("MsgID: " + msg.getJMSMessageID() + " "+ control); - FamilyGenerator familyGen = new FamilyGenerator(); int count = 0; Queuer q = new Queuer(); --- 92,95 ---- --- NEW FILE: FamilyGenerator.java --- package org.tolven.gen.bean; import java.util.Date; import java.util.Random; import javax.ejb.Local; import javax.ejb.Remote; import javax.ejb.Stateless; import org.tolven.gen.FamilyGeneratorLocal; import org.tolven.gen.FamilyGeneratorRemote; import org.tolven.gen.PersonGenerator; import org.tolven.gen.PersonGeneratorRemote; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.entity.VirtualPerson; import org.tolven.gen.entity.FamilyMember.FamilyMemberRole; import org.tolven.gen.util.GenerateCauseOfDeath; import org.tolven.gen.util.GeneratePlace; import org.tolven.gen.util.LifeSpan; import org.tolven.gen.util.RandomNameGenerator; @Stateless @Local(FamilyGeneratorLocal.class) @Remote(FamilyGeneratorRemote.class) public class FamilyGenerator implements FamilyGeneratorLocal, FamilyGeneratorRemote { private RandomNameGenerator nameGenerator; private LifeSpan lifeSpan; private GeneratePlace placeGenerator; private GenerateCauseOfDeath grimReaper; private Random rng; public FamilyGenerator() { nameGenerator = new RandomNameGenerator(); lifeSpan = new LifeSpan(); placeGenerator = new GeneratePlace(); grimReaper = new GenerateCauseOfDeath(); rng = new Random(); } public VirtualPerson generatePerson( ) throws Exception { // if (!ctx.isCallerInRole("gen")) { // throw new SecurityException( "User [" + ctx.getCallerPrincipal() + "] must be in gen role to call GeneratePerson"); // } // A virtual person object VirtualPerson vPerson = new VirtualPerson(); nameGenerator.generateNewName(vPerson); grimReaper.generateCauseOfDeath( vPerson ); lifeSpan.setLifeSpan( vPerson ); return vPerson; } /** * Create a family. * If family name is non-null, then we'll take it as the family name of the family otherwise we'll * use a random name. */ public FamilyUnit generateFamily( String familyName, Date now ) throws Exception { // Start a family FamilyUnit family = new FamilyUnit(); placeGenerator.generateZipCode(family); placeGenerator.generateAddress(family); String primaryGender = null; int primaryAge = 0; int genKids = 0; // Start with a primary person (we should find a suitable mom or dad in 100 tries) for (int c = 0; c < 100; c++) { VirtualPerson person = generatePerson(); primaryAge = person.getAgeInYears(now); if ( primaryAge < 18 ) continue; if (primaryAge < 50) genKids = 3; if (primaryAge < 30) genKids = 2; if (primaryAge < 20) genKids = 1; if (null!=familyName) { family.setFamilyName(familyName); } else { family.setFamilyName(person.getLast()); } person.setLast(family.getFamilyName()); primaryGender = person.getGender(); FamilyMemberRole role; if ("F".equals(person.getGender())) { role = FamilyMember.FamilyMemberRole.MOTHER; } else { role = FamilyMember.FamilyMemberRole.FATHER; } family.addMember( person, role ); break; } // Look for a second person (we may not find one in 10 tries - meaning a single person) for (int c = 0; c < 10; c++) { VirtualPerson person = generatePerson(); int age = person.getAgeInYears( now ); if ( age < 18 ) { // System.out.println( "Rejecting spouse - too young"); continue; } if (primaryGender.equals(person.getGender())) { // System.out.println( "Rejecting spouse - gender"); continue; } int ageDifference = person.getAgeInYears( now )-primaryAge; // If too far apart in age, forget it if (Math.abs( ageDifference) > 10 ) { // System.out.println( "Rejecting spouse - Difference of " + ageDifference + " years"); continue; } // Same last name, add to family person.setLast(family.getFamilyName()); FamilyMemberRole role; if ("F".equals(person.getGender())) { role = FamilyMember.FamilyMemberRole.MOTHER; } else { role = FamilyMember.FamilyMemberRole.FATHER; } family.addMember( person, role ); // System.out.println( "Found suitable spouse (" + family.getFamilyName() + ") after " + c + " failed attempts"); break; } for (int k = 0; k < 100; k++) { if (genKids <= 0) break; VirtualPerson person = generatePerson(); // Ignore people not yet born if (person.getDob().after(now)) continue; int age = person.getAgeInYears( now ); // Assume kids over 18 take care of their own health care if (age > 18) continue; // put at least 18 years between mom and oldest kid if ((primaryAge-age) < 18 ) continue; genKids--; person.setLast(family.getFamilyName()); family.addMember( person, FamilyMemberRole.CHILD ); } return family; } } |
|
From: John C. <jc...@us...> - 2007-03-22 22:50:40
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/resources/rules Removed Files: Tag: P_JC_DATAENTRY4 Sample.drl Log Message: Sync with HEAD --- Sample.drl DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-22 22:50:40
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/src/org/tolven/gen Added Files: Tag: P_JC_DATAENTRY4 FamilyGeneratorLocal.java FamilyGeneratorRemote.java Log Message: Sync with HEAD --- NEW FILE: FamilyGeneratorLocal.java --- package org.tolven.gen; import java.util.Date; import org.tolven.gen.entity.FamilyUnit; public interface FamilyGeneratorLocal { /** * Create a family. * If family name is non-null, then we'll take it as the family name of the family otherwise we'll * use a random name. */ public FamilyUnit generateFamily( String familyName, Date now ) throws Exception; } --- NEW FILE: FamilyGeneratorRemote.java --- package org.tolven.gen; import java.util.Date; import org.tolven.gen.entity.FamilyUnit; public interface FamilyGeneratorRemote { /** * Create a family. * If family name is non-null, then we'll take it as the family name of the family otherwise we'll * use a random name. */ public FamilyUnit generateFamily( String familyName, Date now ) throws Exception; } |
|
From: John C. <jc...@us...> - 2007-03-22 22:50:39
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26063/src/org/tolven/gen/util Removed Files: Tag: P_JC_DATAENTRY4 FamilyGenerator.java Log Message: Sync with HEAD --- FamilyGenerator.java DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-22 07:29:52
|
Update of /cvsroot/tolven/tolvenEJB/src/test/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18420/src/test/rules Modified Files: unitTest3.drl Log Message: Fix TRIM syntax change Index: unitTest3.drl =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/rules/unitTest3.drl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** unitTest3.drl 4 Feb 2007 16:39:57 -0000 1.1 --- unitTest3.drl 22 Mar 2007 07:29:52 -0000 1.2 *************** *** 15,19 **** $trim: Trim() then ! for (ActSlot act : $trim.getActs()) assert( act ); counter.bump(); end --- 15,19 ---- $trim: Trim() then ! assert( $trim.getAct() ); counter.bump(); end |
|
From: John C. <jc...@us...> - 2007-03-22 07:10:41
|
Update of /cvsroot/tolven/tolvenEJB/src/test/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10209/src/test/rules Modified Files: RuleBaseTests.java Added Files: ccrexplode.drl testdata.ccr Log Message: Moved CCR rules test to unit test area. Note: Doesn't work with Java 1.6 Index: RuleBaseTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/rules/RuleBaseTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RuleBaseTests.java 16 Feb 2007 04:00:18 -0000 1.2 --- RuleBaseTests.java 22 Mar 2007 07:10:38 -0000 1.3 *************** *** 5,8 **** --- 5,14 ---- import java.io.Reader; import java.util.Date; + import java.util.HashMap; + + import javax.xml.bind.JAXBContext; + import javax.xml.bind.JAXBException; + import javax.xml.bind.Unmarshaller; + import javax.xml.transform.stream.StreamSource; import junit.framework.TestCase; *************** *** 15,18 **** --- 21,26 ---- import org.drools.compiler.PackageBuilderConfiguration; import org.drools.rule.Package; + import org.tolven.ccr.ContinuityOfCareRecord; + import org.tolven.doc.bean.XMLBean; import org.tolven.trim.Act; import org.tolven.trim.ActClass; *************** *** 98,101 **** --- 106,135 ---- } + public ContinuityOfCareRecord unmarshalCCR( String fileName ) throws Exception { + // String CCR_NS = "urn:astm-org:CCR"; + ClassLoader classLoader = ContinuityOfCareRecord.class.getClassLoader(); + assertFalse(classLoader==null ); + InputStream inputStream = classLoader.getResourceAsStream( fileName ); + + JAXBContext jc = JAXBContext.newInstance( "org.tolven.ccr", classLoader ); + Unmarshaller u = jc.createUnmarshaller(); + ContinuityOfCareRecord ccr = (ContinuityOfCareRecord) u.unmarshal( inputStream ); + inputStream.close(); + return ccr; + } + + public void testRuleBase4( ) throws Exception { + System.out.println( "testRuleBase4 - assert a CCR object"); + // Read and unmarshal an XML file containing ccr + ContinuityOfCareRecord ccr = unmarshalCCR( "test/rules/testdata.ccr"); + // System.setProperty(RuleBaseConfiguration.PROPERTY_ASSERT_BEHAVIOR, RuleBaseConfiguration.WM_BEHAVIOR_EQUALITY ); + RuleBase ruleBase = openRuleBase("test/rules/ccrexplode.drl"); + //load up the rulebase + WorkingMemory workingMemory = ruleBase.newWorkingMemory(); + // Assert a trim object and see what the rules do with it + workingMemory.assertObject(ccr); + workingMemory.fireAllRules(); + workingMemory.dispose(); + } public RuleBase openRuleBase( String ruleFile) throws Exception { --- NEW FILE: ccrexplode.drl --- package org.tolven.rules import java.util.*; import org.tolven.ccr.*; /** * When a CCR document is processed, we first explode the document to include each of the types of elements * provided at the top level and at one level down in the body section. For example, each * ResultType is asserted but not the Tests contained within a result. Other rules will further decompose * such components. * In several cases, we need to create a simple wrapper since the classes used in CCR don't always * contain type information. For example, StructuredProductType does not independently identify * the purpose of the object (Medication, immunization, MedicalEquipment, etc). The wrapper works quite * well for rules which can then just select on the class itself rather than having to dig into the object * looking for types codes, etc (if such codes even existed). */ rule "ccr" when $ccr : ContinuityOfCareRecord($version : version == "V1.0") then System.out.println( "Found ccr version: " + $version + " Id: " + $ccr.getCCRDocumentObjectID()); assert( new PatientType( $ccr )); if ($ccr.getBody()!=null) { ContinuityOfCareRecord.Body body = $ccr.getBody(); if (body.getAlerts()!=null) { for (AlertType alert : body.getAlerts().getAlert()) assert( alert ); } if (body.getEncounters()!=null) { for (EncounterType encounter : body.getEncounters().getEncounter()) assert( encounter ); } if (body.getFamilyHistory()!=null) { for (FamilyHistoryType famHX : body.getFamilyHistory().getFamilyProblemHistory()) assert( famHX ); } if (body.getFunctionalStatus()!=null) { for (FunctionType functionalStatus : body.getFunctionalStatus().getFunction()) assert( functionalStatus ); } if (body.getHealthCareProviders()!=null) { for (ActorReferenceType provider : body.getHealthCareProviders().getProvider()) assert( new ProviderType($ccr, provider) ); } if (body.getImmunizations()!=null) { for (StructuredProductType imm : body.getImmunizations().getImmunization()) assert( new ImmunizationType(imm) ); } if (body.getMedicalEquipment()!=null) { for (StructuredProductType equip : body.getMedicalEquipment().getEquipment()) assert( new MedicalEquipmentType(equip) ); } if (body.getMedications()!=null) { for (StructuredProductType med : body.getMedications().getMedication()) assert( new MedicationType(med) ); } if (body.getPayers()!=null) { for (InsuranceType payer : body.getPayers().getPayer()) assert( payer ); } if (body.getPlanOfCare()!=null) { for (PlanType plan : body.getPlanOfCare().getPlan()) assert( plan ); } if (body.getProblems()!=null) { for (ProblemType problem : body.getProblems().getProblem()) assert( problem ); } if (body.getProcedures()!=null) { for (ProcedureType procedure : body.getProcedures().getProcedure()) assert( procedure ); } if (body.getResults()!=null) { for (ResultType result : body.getResults().getResult()) assert( result ); } if (body.getSocialHistory()!=null) { for (SocialHistoryType socialHistory : body.getSocialHistory().getSocialHistoryElement()) assert( socialHistory ); } if (body.getSupport()!=null) { for (ActorReferenceType support : body.getSupport().getSupportProvider()) assert( new SupportProviderType( $ccr, support) ); } if (body.getVitalSigns()!=null) { for (ResultType vs : body.getVitalSigns().getResult()) assert( new VitalSignType( vs) ); } } end rule "ccr patient" when $patient : PatientType() then System.out.println( "Found CCR patient actor: " + $patient.getActor().getPerson().getName().getCurrentName().getFamilyString() ); end rule "ccr alert" when $alert : AlertType( ) then System.out.println( "Found CCR alert: " + $alert.getDescriptionText() ); end rule "ccr problem" when $problem : ProblemType( ) then System.out.println( "Found CCR problem: " + $problem.getDescriptionText() ); end rule "ccr result" when $result : ResultType( ) then System.out.println( "Found CCR result: " + $result.getDescriptionText() ); // Assert the individual tests for (TestType test : $result.getTest()) { assert( test ); } end rule "ccr result - test" when $test : TestType( ) then System.out.println( "Found CCR test: " + $test.getDescriptionText() ); end --- NEW FILE: testdata.ccr --- <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <ContinuityOfCareRecord xmlns="urn:astm-org:CCR"> <CCRDocumentObjectID>2.16.840.1.113883.3.75.1174510903156.4</CCRDocumentObjectID> <Version>V1.0</Version> <Patient> <ActorID>AC000004</ActorID> </Patient> <Body> <Problems> <Problem> <DateTime> <Type> <Text>Date of Onset</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Problem</Text> </Type> <Description> <Text>Hay Fever</Text> </Description> <Status> <Text>Active</Text> </Status> </Problem> </Problems> <Alerts> <Alert> <DateTime> <Type> <Text>Start Date</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Allergy</Text> </Type> <Description> <Text>Ragweed</Text> </Description> <Status> <Text>Active</Text> </Status> </Alert> <Alert> <DateTime> <Type> <Text>Start Date</Text> </Type> <ExactDateTime>2000-02-16T01:20:30-08:00</ExactDateTime> </DateTime> <Type> <Text>Allergy</Text> </Type> <Description> <Text>Cedar Pollen</Text> </Description> <Status> <Text>Active</Text> </Status> </Alert> </Alerts> </Body> <Actors> <Actor> <ActorObjectID>AC000004</ActorObjectID> <Person> <Name> <CurrentName> <Given>Jonathon</Given> <Middle>Paul</Middle> <Family>Compton</Family> </CurrentName> </Name> <DateOfBirth> <ExactDateTime>1994-08-26T00:00:00-07:00</ExactDateTime> </DateOfBirth> <Gender> <Text>Male</Text> </Gender> </Person> <IDs> <Type> <Text>DemoPatient</Text> </Type> <ID>51538271</ID> </IDs> <Address> <Line1>4519 Charlton Drive</Line1> <City>ANCHORAGE</City> <State>AK</State> <Country>USA</Country> <PostalCode>99507</PostalCode> </Address> </Actor> </Actors> </ContinuityOfCareRecord> |
|
From: John C. <jc...@us...> - 2007-03-22 07:10:41
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10209/resources/rules Removed Files: Sample.drl Log Message: Moved CCR rules test to unit test area. Note: Doesn't work with Java 1.6 --- Sample.drl DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-21 21:02:26
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17869/src/org/tolven/gen/entity Modified Files: FamilyUnit.java FamilyMember.java Log Message: Make FamilyGenerator callable from remote client Index: FamilyMember.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity/FamilyMember.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FamilyMember.java 16 Jan 2007 06:12:47 -0000 1.4 --- FamilyMember.java 21 Mar 2007 21:01:41 -0000 1.5 *************** *** 58,62 **** StringBuffer sb = new StringBuffer(100); sb.append( getRole( )); sb.append( ": "); ! sb.append( getPerson( ).getFirst() + getPerson( ).getLast()); sb.append( ", "); return sb.toString(); } --- 58,66 ---- StringBuffer sb = new StringBuffer(100); sb.append( getRole( )); sb.append( ": "); ! sb.append( getPerson( ).getFirst()); sb.append( " "); ! sb.append( getPerson( ).getMiddle()); sb.append( " "); ! sb.append( getPerson( ).getLast()); sb.append( " "); ! sb.append( getPerson( ).getGender()); sb.append( " "); ! sb.append( getPerson( ).getFormattedDob()); sb.append( " "); return sb.toString(); } Index: FamilyUnit.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/entity/FamilyUnit.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FamilyUnit.java 16 Jan 2007 06:12:47 -0000 1.5 --- FamilyUnit.java 21 Mar 2007 21:01:41 -0000 1.6 *************** *** 68,76 **** { StringBuffer sb = new StringBuffer(100); ! sb.append( getFamilyName( )); sb.append( ": "); sb.append( getAddress( )); sb.append( ", "); sb.append( getCity( )); sb.append( ", "); sb.append( getState( )); sb.append( " "); sb.append( getZip( )); sb.append( " "); return sb.toString(); } --- 68,83 ---- { StringBuffer sb = new StringBuffer(100); ! sb.append("\n"); ! sb.append( getFamilyName( )); sb.append( " family at "); sb.append( getAddress( )); sb.append( ", "); sb.append( getCity( )); sb.append( ", "); sb.append( getState( )); sb.append( " "); sb.append( getZip( )); sb.append( " "); + sb.append("\n"); + for ( FamilyMember member: getMembers()) { + sb.append(" "); + sb.append(member.toString()); + sb.append("\n"); + } return sb.toString(); } |
|
From: John C. <jc...@us...> - 2007-03-21 21:02:26
|
Update of /cvsroot/tolven/tolvenClient/src/org/tolven/client In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18255/src/org/tolven/client Modified Files: LoadTRIM.java TolvenClient.java Test1.java TestLogin.java Added Files: TestFamilyGen.java MyPrincipal.java Test3.java LoadAccountTypes.java Log Message: Make FamilyGenerator callable from remote client Index: Test1.java =================================================================== RCS file: /cvsroot/tolven/tolvenClient/src/org/tolven/client/Test1.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Test1.java 29 Jan 2007 06:26:02 -0000 1.2 --- Test1.java 21 Mar 2007 21:02:15 -0000 1.3 *************** *** 24,28 **** import org.tolven.doc.entity.DocBase; import org.tolven.security.LoginRemote; - import org.tolven.security.key.PrivateKeyRing; import org.tolven.security.key.UserKeyRing; import org.tolven.security.key.UserPrivateKey; --- 24,27 ---- *************** *** 35,46 **** public static final String password = "cal"; - static protected void setupPrivateKeyRing(AccountUser accountUser, Subject subject, UserKeyRing userKeyRing) throws PolicyContextException, GeneralSecurityException, IOException { - UserPrivateKey userPrivateKey = null; - userPrivateKey = userKeyRing.getUserPrivateKey(); - userPrivateKey.unlockPrivateKey("cal".toCharArray()); - PrivateKeyRing privateKeyRing = new PrivateKeyRing(userPrivateKey); - subject.getPrivateCredentials().add(privateKeyRing); - privateKeyRing.setAccountPrivateKey(accountUser.getAccountPrivateKey()); - } static class UsernamePasswordHandler implements CallbackHandler { --- 34,37 ---- *************** *** 125,132 **** lc.login(); - // This isn't actually used because we've commented the decryption below. - if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { - setupPrivateKeyRing( accountUser, lc.getSubject(), loginBean.findUserKeyRing(uid) ); - } System.out.println("User logged in as:" + lc.getSubject().getPrincipals()); --- 116,119 ---- Index: TolvenClient.java =================================================================== RCS file: /cvsroot/tolven/tolvenClient/src/org/tolven/client/TolvenClient.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TolvenClient.java 19 Feb 2007 03:48:07 -0000 1.5 --- TolvenClient.java 21 Mar 2007 21:02:15 -0000 1.6 *************** *** 24,27 **** --- 24,28 ---- import org.tolven.app.CreatorRemote; import org.tolven.app.MenuRemote; + import org.tolven.app.TrimRemote; import org.tolven.core.AccountDAORemote; import org.tolven.core.ActivationRemote; *************** *** 30,36 **** import org.tolven.doc.DocumentRemote; import org.tolven.security.LoginRemote; - import org.tolven.security.key.PrivateKeyRing; - import org.tolven.security.key.UserKeyRing; - import org.tolven.security.key.UserPrivateKey; public abstract class TolvenClient { --- 31,34 ---- *************** *** 44,47 **** --- 42,46 ---- protected LoginRemote loginBean; protected MenuRemote menuBean; + protected TrimRemote trimBean; protected CreatorRemote creatorBean; *************** *** 60,63 **** --- 59,63 ---- creatorBean = (CreatorRemote) ctx.lookup("tolven/CreatorBean/remote"); menuBean = (MenuRemote) ctx.lookup("tolven/MenuBean/remote"); + trimBean = (TrimRemote) ctx.lookup("tolven/TrimBean/remote"); } *************** *** 72,84 **** } ! protected void setupPrivateKeyRing(String password, AccountUser accountUser, Subject subject, UserKeyRing userKeyRing) throws PolicyContextException, GeneralSecurityException, IOException { ! UserPrivateKey userPrivateKey = null; ! userPrivateKey = userKeyRing.getUserPrivateKey(); ! userPrivateKey.unlockPrivateKey(password.toCharArray()); ! PrivateKeyRing privateKeyRing = new PrivateKeyRing(userPrivateKey); ! subject.getPrivateCredentials().add(privateKeyRing); ! privateKeyRing.setAccountPrivateKey(accountUser.getAccountPrivateKey()); ! } ! static class UsernamePasswordHandler implements CallbackHandler { String username; --- 72,79 ---- } ! protected void rollbackTransaction() throws NotSupportedException, SystemException, IllegalStateException, RollbackException, HeuristicMixedException, HeuristicRollbackException { ! ut.rollback(); ! } ! static class UsernamePasswordHandler implements CallbackHandler { String username; *************** *** 126,131 **** // If we make it this far, the login is valid. System.out.println("User logged in as:" + tolvenUser.getLdapUID()); - // This isn't actually used because we've commented the decryption below. - setupPrivateKeyRing( password, accountUser, lc.getSubject(), loginBean.findUserKeyRing(username) ); } --- 121,124 ---- --- NEW FILE: TestFamilyGen.java --- package org.tolven.client; import java.util.Date; import javax.naming.InitialContext; import org.tolven.gen.FamilyGeneratorRemote; import org.tolven.gen.entity.FamilyUnit; public class TestFamilyGen { public static void main(String[] args) throws Exception { InitialContext ctx = new InitialContext(); // Bind to the remote session bean interface in the running server via JNDI/RMI FamilyGeneratorRemote familyGen = (FamilyGeneratorRemote) ctx.lookup("tolven/FamilyGenerator/remote"); Date now = new Date(); for (int x = 0; x < 100; x++) { FamilyUnit fu = familyGen.generateFamily( null, now ); System.out.print(fu); } } } Index: LoadTRIM.java =================================================================== RCS file: /cvsroot/tolven/tolvenClient/src/org/tolven/client/LoadTRIM.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LoadTRIM.java 19 Feb 2007 03:48:07 -0000 1.3 --- LoadTRIM.java 21 Mar 2007 21:02:15 -0000 1.4 *************** *** 13,20 **** public LoadTRIM() throws NamingException { super(); - // TODO Auto-generated constructor stub } - private static long accountId = 23700; private static String directory = "."; private static String EXTENSION = ".trim"; --- 13,18 ---- *************** *** 31,47 **** File dir = new File( directory ); beginTransaction(); ! File files[] = dir.listFiles(new TrimFilter()); ! for (File file : files) { ! InputStream input = new BufferedInputStream( new FileInputStream(file)); ! 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()); ! menuBean.loadTRIM( accountId, templateName, trimXML.toByteArray()); ! System.out.println( "File: " + file.getName()); } - commitTransaction(); } --- 29,51 ---- File dir = new File( directory ); beginTransaction(); ! try { ! File files[] = dir.listFiles(new TrimFilter()); ! for (File file : files) { ! InputStream input = new BufferedInputStream( new FileInputStream(file)); ! 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()); ! trimBean.loadTRIM( templateName, trimXML.toByteArray()); ! System.out.println( "File: " + file.getName()); } ! commitTransaction(); ! } ! catch (Exception e) { ! rollbackTransaction(); ! e.printStackTrace(); } } --- NEW FILE: LoadAccountTypes.java --- package org.tolven.client; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import javax.naming.NamingException; import org.tolven.client.LoadTRIM.TrimFilter; import org.tolven.core.entity.Status; public class LoadAccountTypes extends TolvenClient{ private static String directory = "."; private static String EXTENSION = ".accountType"; public LoadAccountTypes() throws NamingException { super(); } public void runit() throws IOException { //// accountBean.createAccountType("admin", "admin/sysadmin.jsf", "SystemAdministrator", false, Status.ACTIVE.value()); // accountBean.createAccountType("echr", "echr.jsf", "Clinical Account", false, Status.ACTIVE.value()); // accountBean.createAccountType("ephr", "ephr.jsf", "Personal Account", false, Status.ACTIVE.value()); } public static void main(String[] args) throws Exception { LoadAccountTypes lat = new LoadAccountTypes(); lat.runit(); } } --- NEW FILE: Test3.java --- package org.tolven.client; import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.tolven.core.AccountDAORemote; import org.tolven.core.ActivationRemote; import org.tolven.core.entity.AccountType; import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentRemote; import org.tolven.security.LoginRemote; public class Test3 { public static final String uid = "cal"; public static final String password = "cal"; public static final long accountId = 11800; /** * @param args * @throws NamingException */ public static void main(String[] args) throws NamingException { Properties prop = new Properties(); prop.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); prop.put(Context.PROVIDER_URL, "jnp://localhost:1099"); prop.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces"); prop.put("java.naming.security.principal", uid); prop.put("java.naming.security.credentials", password); Context ctx = new InitialContext(prop); DocumentRemote docBean = (DocumentRemote) ctx.lookup("tolven/DocumentBean/remote"); AccountDAORemote accountBean = (AccountDAORemote) ctx.lookup("tolven/AccountDAOBean/remote"); ActivationRemote activationBean = (ActivationRemote) ctx.lookup("tolven/ActivationBean/remote"); LoginRemote loginBean = (LoginRemote) ctx.lookup("tolven/LoginBean/remote"); long docCount = docBean.countDocuments(accountId); System.out.println("Account " + accountId + " has " + docCount + " doucments"); System.out.println("Attempting to get TolvenUser: " + uid); TolvenUser user = activationBean.findUser( uid ); System.out.println("User " + user.getId() + " Last login: " + user.getLastLogin()); } } Index: TestLogin.java =================================================================== RCS file: /cvsroot/tolven/tolvenClient/src/org/tolven/client/TestLogin.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TestLogin.java 16 Feb 2007 05:54:30 -0000 1.3 --- TestLogin.java 21 Mar 2007 21:02:15 -0000 1.4 *************** *** 6,10 **** public class TestLogin extends TolvenClient { ! public static final long accountId = 11800; public static final String uid = "cal"; public static final String password = "cal"; --- 6,10 ---- public class TestLogin extends TolvenClient { ! public static final long accountId = 22100; public static final String uid = "cal"; public static final String password = "cal"; --- NEW FILE: MyPrincipal.java --- package org.tolven.client; import java.security.Principal; import java.util.HashSet; public class MyPrincipal implements Principal { String name; MyPrincipal( String name ) { this.name = name; } public String getName() { return name; } public String toString( ) { return "Principal: " + name; } public int hashCode( ) { if (name==null) return 0; return name.hashCode(); } @Override public boolean equals(Object obj) { if ( !(obj instanceof MyPrincipal)) return false; return name.equals(((MyPrincipal)obj).getName()); } public static void main(String[] args) { HashSet<MyPrincipal> hash = new HashSet<MyPrincipal>(); hash.add(new MyPrincipal( "Name 1")); hash.add(new MyPrincipal( "Name 2")); hash.add(new MyPrincipal( "Name 3")); hash.add(new MyPrincipal( "Name 3")); System.out.println( hash ); } } |
|
From: John C. <jc...@us...> - 2007-03-21 21:01:47
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17869/src/org/tolven/gen/bean Modified Files: GenDriver.java Added Files: FamilyGenerator.java Log Message: Make FamilyGenerator callable from remote client Index: GenDriver.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenDriver.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GenDriver.java 12 Feb 2007 07:07:27 -0000 1.5 --- GenDriver.java 21 Mar 2007 21:01:41 -0000 1.6 *************** *** 37,44 **** import org.tolven.doc.XMLLocal; import org.tolven.doc.bean.TolvenMessage; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.model.GenMedicalCCR; - import org.tolven.gen.util.FamilyGenerator; /** * Control the Data Generator process. This process starts when a client queues a message to the --- 37,44 ---- import org.tolven.doc.XMLLocal; import org.tolven.doc.bean.TolvenMessage; + import org.tolven.gen.FamilyGeneratorLocal; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.model.GenMedicalCCR; /** * Control the Data Generator process. This process starts when a client queues a message to the *************** *** 70,73 **** --- 70,75 ---- @EJB private XMLLocal xmlBean; + @EJB private FamilyGeneratorLocal familyGen; + // private JAXBContext jc = null; // *************** *** 90,94 **** GenControlCHRAccount control = (GenControlCHRAccount) ((ObjectMessage)msg).getObject(); System.out.println("MsgID: " + msg.getJMSMessageID() + " "+ control); - FamilyGenerator familyGen = new FamilyGenerator(); int count = 0; Queuer q = new Queuer(); --- 92,95 ---- --- NEW FILE: FamilyGenerator.java --- package org.tolven.gen.bean; import java.util.Date; import java.util.Random; import javax.ejb.Local; import javax.ejb.Remote; import javax.ejb.Stateless; import org.tolven.gen.FamilyGeneratorLocal; import org.tolven.gen.FamilyGeneratorRemote; import org.tolven.gen.PersonGenerator; import org.tolven.gen.PersonGeneratorRemote; import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; import org.tolven.gen.entity.VirtualPerson; import org.tolven.gen.entity.FamilyMember.FamilyMemberRole; import org.tolven.gen.util.GenerateCauseOfDeath; import org.tolven.gen.util.GeneratePlace; import org.tolven.gen.util.LifeSpan; import org.tolven.gen.util.RandomNameGenerator; @Stateless @Local(FamilyGeneratorLocal.class) @Remote(FamilyGeneratorRemote.class) public class FamilyGenerator implements FamilyGeneratorLocal, FamilyGeneratorRemote { private RandomNameGenerator nameGenerator; private LifeSpan lifeSpan; private GeneratePlace placeGenerator; private GenerateCauseOfDeath grimReaper; private Random rng; public FamilyGenerator() { nameGenerator = new RandomNameGenerator(); lifeSpan = new LifeSpan(); placeGenerator = new GeneratePlace(); grimReaper = new GenerateCauseOfDeath(); rng = new Random(); } public VirtualPerson generatePerson( ) throws Exception { // if (!ctx.isCallerInRole("gen")) { // throw new SecurityException( "User [" + ctx.getCallerPrincipal() + "] must be in gen role to call GeneratePerson"); // } // A virtual person object VirtualPerson vPerson = new VirtualPerson(); nameGenerator.generateNewName(vPerson); grimReaper.generateCauseOfDeath( vPerson ); lifeSpan.setLifeSpan( vPerson ); return vPerson; } /** * Create a family. * If family name is non-null, then we'll take it as the family name of the family otherwise we'll * use a random name. */ public FamilyUnit generateFamily( String familyName, Date now ) throws Exception { // Start a family FamilyUnit family = new FamilyUnit(); placeGenerator.generateZipCode(family); placeGenerator.generateAddress(family); String primaryGender = null; int primaryAge = 0; int genKids = 0; // Start with a primary person (we should find a suitable mom or dad in 100 tries) for (int c = 0; c < 100; c++) { VirtualPerson person = generatePerson(); primaryAge = person.getAgeInYears(now); if ( primaryAge < 18 ) continue; if (primaryAge < 50) genKids = 3; if (primaryAge < 30) genKids = 2; if (primaryAge < 20) genKids = 1; if (null!=familyName) { family.setFamilyName(familyName); } else { family.setFamilyName(person.getLast()); } person.setLast(family.getFamilyName()); primaryGender = person.getGender(); FamilyMemberRole role; if ("F".equals(person.getGender())) { role = FamilyMember.FamilyMemberRole.MOTHER; } else { role = FamilyMember.FamilyMemberRole.FATHER; } family.addMember( person, role ); break; } // Look for a second person (we may not find one in 10 tries - meaning a single person) for (int c = 0; c < 10; c++) { VirtualPerson person = generatePerson(); int age = person.getAgeInYears( now ); if ( age < 18 ) { // System.out.println( "Rejecting spouse - too young"); continue; } if (primaryGender.equals(person.getGender())) { // System.out.println( "Rejecting spouse - gender"); continue; } int ageDifference = person.getAgeInYears( now )-primaryAge; // If too far apart in age, forget it if (Math.abs( ageDifference) > 10 ) { // System.out.println( "Rejecting spouse - Difference of " + ageDifference + " years"); continue; } // Same last name, add to family person.setLast(family.getFamilyName()); FamilyMemberRole role; if ("F".equals(person.getGender())) { role = FamilyMember.FamilyMemberRole.MOTHER; } else { role = FamilyMember.FamilyMemberRole.FATHER; } family.addMember( person, role ); // System.out.println( "Found suitable spouse (" + family.getFamilyName() + ") after " + c + " failed attempts"); break; } for (int k = 0; k < 100; k++) { if (genKids <= 0) break; VirtualPerson person = generatePerson(); // Ignore people not yet born if (person.getDob().after(now)) continue; int age = person.getAgeInYears( now ); // Assume kids over 18 take care of their own health care if (age > 18) continue; // put at least 18 years between mom and oldest kid if ((primaryAge-age) < 18 ) continue; genKids--; person.setLast(family.getFamilyName()); family.addMember( person, FamilyMemberRole.CHILD ); } return family; } } |
3 messages has been excluded from this view by a project administrator.
