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...> - 2006-10-07 22:24:55
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7206/installer/izpack-8.1 Modified Files: shortcutSpec.xml Log Message: Changes to Windows shortcut to allow Antelope to work on non-drive C Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/shortcutSpec.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shortcutSpec.xml 3 Oct 2006 08:12:51 -0000 1.3 --- shortcutSpec.xml 7 Oct 2006 22:24:53 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- <shortcut name="Start Antelope" target="$INSTALL_PATH\bin\startAntelope.bat" + workingDirectory="$INSTALL_PATH\tolven\lib\antelope\AntelopeApp_3.2.18" description="Start Antelope" programGroup="yes" desktop="no" applications="no" *************** *** 13,16 **** --- 14,18 ---- <shortcut name="Start Tolven JBoss" target="$INSTALL_PATH\bin\startTolvenJBoss.bat" + workingDirectory="$INSTALL_PATH" description="Start Tolven JBoss" programGroup="yes" desktop="no" applications="no" *************** *** 20,23 **** --- 22,26 ---- <shortcut name="Stop Tolven JBoss" target="$INSTALL_PATH\bin\stopTolvenJBoss.bat" + workingDirectory="$INSTALL_PATH" description="Stop Tolven JBoss" programGroup="yes" desktop="no" applications="no" *************** *** 27,30 **** --- 30,34 ---- <shortcut name="Uninstall Tolven" target="$INSTALL_PATH\Uninstaller\uninstaller.jar" + workingDirectory="$INSTALL_PATH" description="Uninstall Tolven" programGroup="yes" desktop="no" applications="no" |
|
From: John C. <jc...@us...> - 2006-10-07 22:24:55
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7206/installer/izpack-8.1/bin Modified Files: startAntelope.bat Log Message: Changes to Windows shortcut to allow Antelope to work on non-drive C Index: startAntelope.bat =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/bin/startAntelope.bat,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** startAntelope.bat 2 Oct 2006 06:49:03 -0000 1.2 --- startAntelope.bat 7 Oct 2006 22:24:53 -0000 1.3 *************** *** 1,2 **** set ANT_HOME=$INSTALL_PATH\apache-ant-1.6.5 ! java -jar $INSTALL_PATH\tolven\lib\antelope\AntelopeApp_3.2.18\AntelopeApp.jar \ No newline at end of file --- 1,3 ---- set ANT_HOME=$INSTALL_PATH\apache-ant-1.6.5 ! set JAVA_HOME=$JDKPath ! %ANT_HOME%\bin\ant -f run.xml \ No newline at end of file |
|
From: John C. <jc...@us...> - 2006-10-06 03:19:02
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29825/src/org/tolven/app/bean Modified Files: MenuBean.java Log Message: Fix typo in menu name Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** MenuBean.java 3 Oct 2006 03:14:43 -0000 1.32 --- MenuBean.java 6 Oct 2006 03:18:58 -0000 1.33 *************** *** 522,526 **** em.persist( docs ); MenuStructure docDetail = new MenuStructure( ! root.getAccount(), docs, "test/docDetail.xhtml", null, 3, "detail", "document Detail", "true", null, "detail" ); em.persist( docDetail ); --- 522,526 ---- em.persist( docs ); MenuStructure docDetail = new MenuStructure( ! root.getAccount(), docs, "test/docDetail.xhtml", null, 3, "detail", "Document Detail", "true", null, "detail" ); em.persist( docDetail ); |
|
From: Joseph I. <jos...@us...> - 2006-10-05 08:39:36
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29937/security-config Modified Files: build.xml Log Message: Renamed LDAP targets in security build so they are more consistent and easy to follow, while fixing bugs in the handling or remote LDAP targets. I wil have to return and do the same for Postgresql at some point, so that a pattern developes. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** build.xml 1 Oct 2006 07:17:54 -0000 1.48 --- build.xml 5 Oct 2006 08:39:34 -0000 1.49 *************** *** 588,599 **** </target> - <target name="deploy-ldap-credentials" description="Initialize LDAP for Tolven"> - <fail unless="ldap.location.browsable" /> - <condition property="deploy-ldap-target" value="deploy-certs-to-localhost-ldap" else="deploy-certs-to-remote-ldap"> - <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> - </condition> - <antcall target="${deploy-ldap-target}" /> - </target> - <target name="deploy-db-credentials" description="Initialize Postgres for Tolven"> <fail unless="postgres.location.browsable" /> --- 588,591 ---- *************** *** 630,679 **** </target> - <target name="deploy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> - <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> - <fileset dir="${tolven.stage}/ldap-deploy-location"> - <include name="tolvendev-ldap-cert.pem"/> - <include name="tolvendev-ldap-key.pem"/> - <include name="tolvendev-ldap-cacerts.pem"/> - </fileset> - </copy> - <condition property="deploy-certs-to-localhost-ldap-target" value="fix-permissions-localhost-ldap-windows" else="fix-permissions-localhost-ldap-unix"> - <os family="windows"/> - </condition> - <antcall target="${deploy-certs-to-localhost-ldap-target}" /> - </target> - - <target name="fix-permissions-localhost-ldap-windows" description="Fix certificate permissions LDAP on windows"> - <exec dir="${ldap.location}" executable="cacls" failonerror="true"> - <arg line="*.pem /E /R Users" /> - </exec> - </target> - - <target name="fix-permissions-localhost-ldap-unix" description="Fix certificate permissions LDAP on unix"> - <chmod perm="600"> - <fileset dir="${ldap.location}"> - <include name="tolvendev-ldap-cert.pem"/> - <include name="tolvendev-ldap-key.pem"/> - <include name="tolvendev-ldap-cacerts.pem"/> - </fileset> - </chmod> - </target> - - <target name="deploy-certs-to-remote-ldap" description="Copy certificates to remote LDAP for Tolven"> - <fail unless="ldap.host" /> - <fail unless="ldap.location" /> - <input message="To copy certificates, please enter username for remote LDAP host: ${ldap.host} (ldap.host.user can be set in the ant properties file)" addproperty="ldap.host.user" /> - <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> - <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> - <fileset dir="${tolven.stage}/ldap-deploy-location"> - <include name="tolvendev-ldap-cert.pem"/> - <include name="tolvendev-ldap-key.pem"/> - <include name="tolvendev-ldap-cacerts.pem"/> - </fileset> - </scp> - <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && chmod 600 *.pem" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> - <echo level="info" message="tolvendev-ldap-cert.pem, tolvendev-ldap-key.pem and tolvendev-ldap-cacerts.pem have been copied to ${ldap.host.user}@${ldap.host}:${ldap.location}" /> - </target> - <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> --- 622,625 ---- *************** *** 734,740 **** </target> ! <target name="deploy-ldap-slapd-conf-windows-from-stage"> <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="slapd.conf"/> </fileset> --- 680,761 ---- </target> ! <target name="deploy-ldap-credentials" description="Initialize LDAP for Tolven"> ! <fail unless="ldap.location.browsable" /> ! <condition property="deploy-ldap-credentials-target" value="deploy-ldap-credentials-local" else="deploy-ldap-credentials-remote"> ! <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> ! </condition> ! <antcall target="${deploy-ldap-credentials-target}" /> ! </target> ! ! <target name="deploy-ldap-credentials-remote" description="Copy certificates to remote LDAP for Tolven"> ! <fail unless="ldap.host" /> ! <fail unless="ldap.location" /> ! <input message="To copy certificates, please enter username for remote LDAP host: ${ldap.host} (ldap.host.user can be set in the ant properties file)" addproperty="ldap.host.user" /> ! <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> ! <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.stage}/ldap-deploy-location"> ! <include name="tolvendev-ldap-cert.pem"/> ! <include name="tolvendev-ldap-key.pem"/> ! <include name="tolvendev-ldap-cacerts.pem"/> ! </fileset> ! </scp> ! <sshexec host="${ldap.host}" username="${ldap.host.user}" command="chmod 600 ${ldap.location}/*.pem" password="${tolven.ldap.host.password}" trust="true" failonerror="false" /> ! <echo level="info" message="tolvendev-ldap-cert.pem, tolvendev-ldap-key.pem and tolvendev-ldap-cacerts.pem have been copied to ${ldap.host.user}@${ldap.host}:${ldap.location}" /> ! </target> ! ! <target name="deploy-ldap-credentials-local" description="Copy certificates to localhost LDAP for Tolven"> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> ! <fileset dir="${tolven.stage}/ldap-deploy-location"> ! <include name="tolvendev-ldap-cert.pem"/> ! <include name="tolvendev-ldap-key.pem"/> ! <include name="tolvendev-ldap-cacerts.pem"/> ! </fileset> ! </copy> ! <condition property="fix-ldap-permissions-local-target" value="fix-ldap-permissions-local-windows" else="fix-ldap-permissions-local-unix"> ! <os family="windows"/> ! </condition> ! <antcall target="${fix-ldap-permissions-local-target}" /> ! </target> ! ! <target name="fix-ldap-permissions-local-windows" description="Fix certificate permissions LDAP on windows"> ! <exec dir="${ldap.location}" executable="cacls" failonerror="true"> ! <arg line="*.pem /E /R Users" /> ! </exec> ! </target> ! ! <target name="fix-ldap-permissions-local-unix" description="Fix certificate permissions LDAP on unix"> ! <chmod perm="600"> ! <fileset dir="${ldap.location}"> ! <include name="tolvendev-ldap-cert.pem"/> ! <include name="tolvendev-ldap-key.pem"/> ! <include name="tolvendev-ldap-cacerts.pem"/> ! </fileset> ! </chmod> ! </target> ! ! <target name="deploy-ldap-config"> ! <fail unless="ldap.location.browsable" /> ! <condition property="deploy-ldap-config-target" value="deploy-ldap-config-local" else="deploy-ldap-config-remote"> ! <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> ! </condition> ! <antcall target="${deploy-ldap-config-target}" /> ! </target> ! ! <target name="deploy-ldap-config-remote"> ! <scp file="${tolven.stage}/ldap-deploy-location/slapd_linux.conf" remoteTofile="${ldap.host.user}@${ldap.host}:${ldap.location}/slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> ! <scp file="${tolven.stage}/ldap-deploy-location/tolveninitial.ldif" todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> ! </target> ! ! <target name="deploy-ldap-config-local"> ! <condition property="deploy-ldap-config-local-target" value="deploy-ldap-config-local-windows" else="deploy-ldap-config-local-unix"> ! <os family="windows"/> ! </condition> ! <antcall target="${deploy-ldap-config-local-target}" /> ! </target> ! ! <target name="deploy-ldap-config-local-windows"> <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> + <include name="tolveninitial.ldif"/> <include name="slapd.conf"/> </fileset> *************** *** 742,751 **** </target> ! <target name="deploy-ldap-slapd-conf-linux-from-stage"> ! <copy file="${tolven.stage}/ldap-deploy-location/slapd_linux.conf" tofile="${ldap.location}/slapd.conf" /> </target> <target name="ldapInit-local" description="Initialize a Tolven-specific LDAP server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> <condition property="ldap-command" value="${ldap.location}/slapadd.exe" else="slapadd"> <os family="windows"/> --- 763,788 ---- </target> ! <target name="deploy-ldap-config-local-unix"> ! <copy file="${tolven.stage}/ldap-deploy-location/slapd_linux.conf" tofile="${ldap.location}/slapd.conf" preservelastmodified="true" filtering="true" verbose="${message.show.copy}" /> ! <copy file="${tolven.stage}/ldap-deploy-location/tolveninitial.ldif" todir="${ldap.location}" preservelastmodified="true" filtering="true" verbose="${message.show.copy}" /> </target> + <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> + <fail unless="ldap.location.browsable" /> + <condition property="ldapInit-target" value="ldapInit-local" else="ldapInit-remote"> + <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> + </condition> + <antcall target="${ldapInit-target}" /> + </target> + + <target name="ldapInit-remote" description="Initialize a Tolven-specific LDAP remote unix server"> + <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> + <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && mkdir -p tolvendata && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> + <echo level="info" message="You can start the LDAP server (SLAPD) now"/> + </target> + <target name="ldapInit-local" description="Initialize a Tolven-specific LDAP server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> + <mkdir dir="${ldap.location}/tolvendata" /> <condition property="ldap-command" value="${ldap.location}/slapadd.exe" else="slapadd"> <os family="windows"/> *************** *** 757,766 **** </target> - <target name="ldapInit-remote-unix" description="Initialize a Tolven-specific LDAP remote unix server"> - <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> - <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> - <echo level="info" message="You can start the LDAP server (SLAPD) now"/> - </target> - <target name="get-cert-from-ldap"> <echo level="info" message="Test LDAP after a LDAP server is started with a copy of the created certificates...all certificates must be in their original creation directories." /> --- 794,797 ---- |
|
From: Joseph I. <jos...@us...> - 2006-10-05 08:39:35
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29937 Modified Files: build.xml Log Message: Renamed LDAP targets in security build so they are more consistent and easy to follow, while fixing bugs in the handling or remote LDAP targets. I wil have to return and do the same for Postgresql at some point, so that a pattern developes. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** build.xml 2 Oct 2006 06:49:04 -0000 1.63 --- build.xml 5 Oct 2006 08:39:33 -0000 1.64 *************** *** 49,66 **** <target name="deploy-ldap-from-stage"> - <mkdir dir="${ldap.location}/tolvendata"/> - <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> - <fileset dir="${tolven.stage}/ldap-deploy-location"> - <include name="tolvendev-ldap-cert.pem" /> - <include name="tolvendev-ldap-key.pem" /> - <include name="tolvendev-ldap-cacerts.pem" /> - <include name="tolveninitial.ldif"/> - </fileset> - </copy> - <condition property="deploy-ldap-from-stage-target" value="deploy-ldap-slapd-conf-windows-from-stage" else="deploy-ldap-slapd-conf-linux-from-stage"> - <os family="windows"/> - </condition> - <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="${deploy-ldap-from-stage-target}" /> <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" /> </target> --- 49,54 ---- <target name="deploy-ldap-from-stage"> <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" /> + <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-config" /> </target> *************** *** 132,140 **** <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> ! <fail unless="ldap.location.browsable" /> ! <condition property="ldapInit-target" value="ldapInit-local" else="ldapInit-remote-unix"> ! <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> ! </condition> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="${ldapInit-target}" /> </target> --- 120,124 ---- <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="ldapInit" /> </target> |
|
From: Joseph I. <jos...@us...> - 2006-10-05 08:37:01
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28627/installer/izpack-8.1 Modified Files: installUserInputSpec.xml Log Message: There was a one letter typo which would prevent the redirect port on the webserver from working correctly. Removed the prompted user names, since users can have anything for logging in and unlike in other cases, no default passwords can be provided. Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** installUserInputSpec.xml 3 Oct 2006 07:45:15 -0000 1.4 --- installUserInputSpec.xml 5 Oct 2006 08:36:54 -0000 1.5 *************** *** 884,893 **** <description align="left" txt="Please enter the login ID and password to copy credentials to the LDAP Host" /> ! <spec txt="User Login ID:" size="20" set="ldap" /> </field> <field type="password" variable="LDAP_HOST_PASSWORD"> <spec> ! <pwd txt="Password:" size="20" set="" /> ! <pwd txt="Retype Password:" size="20" set="" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" --- 884,893 ---- <description align="left" txt="Please enter the login ID and password to copy credentials to the LDAP Host" /> ! <spec txt="User Login ID:" size="20" /> </field> <field type="password" variable="LDAP_HOST_PASSWORD"> <spec> ! <pwd txt="Password:" size="20" /> ! <pwd txt="Retype Password:" size="20" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" *************** *** 980,989 **** <description align="left" txt="Please enter the login ID and password to copy credentials to the Postgresql Host" /> ! <spec txt="User Login ID:" size="20" set="postgres" /> </field> <field type="password" variable="DB_HOST_PASSWORD"> <spec> ! <pwd txt="Password:" size="20" set="" /> ! <pwd txt="Retype Password:" size="20" set="" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" --- 980,989 ---- <description align="left" txt="Please enter the login ID and password to copy credentials to the Postgresql Host" /> ! <spec txt="User Login ID:" size="20" /> </field> <field type="password" variable="DB_HOST_PASSWORD"> <spec> ! <pwd txt="Password:" size="20" /> ! <pwd txt="Retype Password:" size="20" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" *************** *** 1074,1078 **** txt="WebServer HTTPS Port cannot be blank." /> </field> ! <field type="rule" variable="WEBSERVER_HTTP_REDIRECTPOR"> <spec txt="WebServer Redirect Port:" set="0:8443" layout="N:5:U" /> <validator --- 1074,1078 ---- txt="WebServer HTTPS Port cannot be blank." /> </field> ! <field type="rule" variable="WEBSERVER_HTTP_REDIRECTPORT"> <spec txt="WebServer Redirect Port:" set="0:8443" layout="N:5:U" /> <validator |
|
From: John C. <jc...@us...> - 2006-10-04 17:12:07
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17677/web/five Added Files: other.xhtml pastAppointments.xhtml todo.xhtml allergies.xhtml medications.xhtml providers.xhtml medhx.xhtml protocols.xhtml selfMed.xhtml Log Message: Add placeholder pages for incomplete panes --- NEW FILE: other.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Past Appointments</title> </head> <body> <ui:composition> <p>A list of other results go here for element #{param.element}, path #{menu.targetMenuPath.path}. For specialties, this category might be replaced by specific categories such as pathology, microbiology, cytology, or similar categories of results. </p> </ui:composition> </body> </html> --- NEW FILE: medications.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Past Appointments</title> </head> <body> <ui:composition> <p>A list of medications goes here for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> --- NEW FILE: todo.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>To Do Items</title> </head> <body> <ui:composition> <p>A list of "to do" items go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p> </ui:composition> </body> </html> --- NEW FILE: medhx.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Medical History</title> </head> <body> <ui:composition> <p> A full list of medical history for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> --- NEW FILE: protocols.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Providers</title> </head> <body> <ui:composition> <p> A list of the providers for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> --- NEW FILE: selfMed.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Past Appointments</title> </head> <body> <ui:composition> <p> Over the counter and home remedies for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> --- NEW FILE: allergies.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Past Appointments</title> </head> <body> <ui:composition> <p> A list of allergies for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> --- NEW FILE: pastAppointments.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Past Appointments</title> </head> <body> <ui:composition><p>Past appointments go here for element #{param.element}, path #{menu.targetMenuPath.path}.</p></ui:composition> </body> </html> --- NEW FILE: providers.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Medical History</title> </head> <body> <ui:composition> <p> A full list of medical history for the patient for element #{param.element}, path #{menu.targetMenuPath.path}. </p> </ui:composition> </body> </html> |
|
From: John C. <jc...@us...> - 2006-10-03 23:29:47
|
Update of /cvsroot/tolven/tolven/postgres-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7160/postgres-config Added Files: indexes.sql Log Message: Recommended indexes on Tolven tables --- NEW FILE: indexes.sql --- DROP INDEX app.md_index1; DROP INDEX app.ms_index1; DROP INDEX app.mcol_index1; DROP INDEX core.au_index1; DROP INDEX core.user_index1; DROP INDEX doc.doc_index1; CREATE INDEX md_index1 ON app.menu_data USING btree (account_id, menustructure_id); CREATE INDEX ms_index1 ON app.menu_structure USING btree (account_id, path_name); CREATE INDEX mcol_index1 ON app.ms_column USING btree (menustructure_id, account_id); CREATE INDEX au_index1 ON core.account_user USING btree (user_id); CREATE INDEX user_index1 ON core.tolven_user USING btree (uid, status, id); CREATE INDEX doc_index1 ON doc.document USING btree (account_id, xml_name); |
|
From: John C. <jc...@us...> - 2006-10-03 20:37:10
|
Update of /cvsroot/tolven/tolven/postgres-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3403/postgres-config Modified Files: tolven-database-init.sql Log Message: Create CTOM schema Index: tolven-database-init.sql =================================================================== RCS file: /cvsroot/tolven/tolven/postgres-config/tolven-database-init.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tolven-database-init.sql 27 Jul 2006 20:22:22 -0000 1.4 --- tolven-database-init.sql 3 Oct 2006 20:37:05 -0000 1.5 *************** *** 18,20 **** CREATE SCHEMA who; ! COMMENT ON SCHEMA who IS 'world Health Organization Tables'; \ No newline at end of file --- 18,23 ---- CREATE SCHEMA who; ! COMMENT ON SCHEMA who IS 'world Health Organization Tables'; ! ! CREATE SCHEMA ctom; ! COMMENT ON SCHEMA who IS 'NCI Clinical Trial Object Model'; \ No newline at end of file |
|
From: John C. <jc...@us...> - 2006-10-03 15:20:35
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32191/src/org/tolven/web Modified Files: MenuAction.java Log Message: Fixed bug in lipid graph called from ePHR Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** MenuAction.java 3 Oct 2006 03:09:19 -0000 1.21 --- MenuAction.java 3 Oct 2006 15:20:30 -0000 1.22 *************** *** 371,375 **** if (graphURL==null) { // System.out.println("Preparing Graph"); ! JFreeChart chart = createChart(createDataset("echr:patient:results:lab")); String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false)); graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8"); --- 371,376 ---- if (graphURL==null) { // System.out.println("Preparing Graph"); ! MenuStructure ms = getThisMenu( ); ! JFreeChart chart = createChart(createDataset( ms.getAccount().getKnownType() + ":patient:results:lab")); String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false)); graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8"); |
|
From: Joseph I. <jos...@us...> - 2006-10-03 08:12:53
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18346/installer/izpack-8.1 Modified Files: shortcutSpec.xml Log Message: Added a Tolven Program Group menu option to Uninstall. Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/shortcutSpec.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shortcutSpec.xml 2 Oct 2006 06:49:03 -0000 1.2 --- shortcutSpec.xml 3 Oct 2006 08:12:51 -0000 1.3 *************** *** 25,27 **** --- 25,34 ---- <createForPack name="short-cuts" /> </shortcut> + <shortcut name="Uninstall Tolven" + target="$INSTALL_PATH\Uninstaller\uninstaller.jar" + description="Uninstall Tolven" + programGroup="yes" desktop="no" applications="no" + startMenu="no" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> </shortcuts> \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-10-03 07:45:17
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6802/installer/izpack-8.1 Modified Files: installUserInputSpec.xml Log Message: Added validation to prevent blank fields, and enforce some formatting of input fields to the installer. Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** installUserInputSpec.xml 3 Oct 2006 05:40:25 -0000 1.3 --- installUserInputSpec.xml 3 Oct 2006 07:45:15 -0000 1.4 *************** *** 847,862 **** <panel order="5"> <field type="title" txt="LDAP Host" /> ! <field type="text" variable="LDAP_HOST"> <description align="left" txt="Tolven needs to communicate with LDAP in order to create users. (Tolven doesn't handle logins which are done by JAAS)." /> ! <spec txt="Hostname or IP:" size="20" set="localhost" /> </field> ! <field type="text" variable="LDAP_PORT"> ! <spec txt="LDAP Port:" size="10" set="636" /> </field> - <field type="staticText" align="left" - txt="If True is selected, then browse to the LDAP home directory." /> - <field type="staticText" align="left" - txt="If False is selected, then the LDAP home directory on the target machine should be entered into the combobox manually." /> <field type="radio" variable="LDAP_HOST_BROWSABLE"> <description align="left" --- 847,864 ---- <panel order="5"> <field type="title" txt="LDAP Host" /> ! <field type="rule" variable="LDAP_HOST"> <description align="left" txt="Tolven needs to communicate with LDAP in order to create users. (Tolven doesn't handle logins which are done by JAAS)." /> ! <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Hostname or IP cannot be blank." /> </field> ! <field type="rule" variable="LDAP_PORT"> ! <spec txt="LDAP Port:" set="0:636" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="LDAP Port cannot be blank." /> </field> <field type="radio" variable="LDAP_HOST_BROWSABLE"> <description align="left" *************** *** 867,872 **** </spec> </field> <field type="search" variable="LDAP_LOCATION"> ! <spec txt="Local or Browsable LDAP Location:" type="directory" result="file"> <choice value="/etc/openldap" os="unix" /> <choice value="c:\OpenLDAP" os="windows" /> --- 869,878 ---- </spec> </field> + <field type="staticText" align="left" + txt="If True is selected, then browse to the LDAP home directory." /> + <field type="staticText" align="left" + txt="If False is selected, then the LDAP home directory on the target machine should be entered into the combo box manually." /> <field type="search" variable="LDAP_LOCATION"> ! <spec txt="LDAP Home Directory:" type="directory" result="file"> <choice value="/etc/openldap" os="unix" /> <choice value="c:\OpenLDAP" os="windows" /> *************** *** 924,946 **** txt="Both versions of the password must match" /> </field> ! <field type="text" variable="LDAP_SALT"> ! <spec txt="LDAP Salt:" size="20" set="hgfedcba" /> </field> ! <field type="text" variable="LDAP_ITERATIONS"> ! <spec txt="LDAP Iterations:" size="20" set="13" /> </field> </panel> <panel order="7"> <field type="title" txt="Postgresql Host" /> ! <field type="text" variable="DB_HOST"> ! <spec txt="Hostname or IP:" size="20" set="localhost" /> </field> ! <field type="text" variable="DB_PORT"> ! <spec txt="Port:" size="20" set="5432" /> </field> - <field type="staticText" align="left" - txt="If True is selected, then browse to the Postgresql home directory." /> - <field type="staticText" align="left" - txt="If False is selected, then the Postgresql home directory on the target machine should be entered into the combobox manually." /> <field type="radio" variable="DB_HOST_BROWSABLE"> <description align="left" --- 930,960 ---- txt="Both versions of the password must match" /> </field> ! <field type="rule" variable="LDAP_SALT"> ! <spec txt="LDAP Password Hash Salt::" set="0:hgfedcba" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Password Hash Salt cannot be blank." /> </field> ! <field type="rule" variable="LDAP_ITERATIONS"> ! <spec txt="LDAP Password Hash Iterations:" set="0:13" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Password Hash Iterations cannot be blank." /> </field> </panel> <panel order="7"> <field type="title" txt="Postgresql Host" /> ! <field type="rule" variable="DB_HOST"> ! <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Hostname or IP cannot be blank." /> </field> ! <field type="rule" variable="DB_PORT"> ! <spec txt="Port:" set="0:5432" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Port cannot be blank." /> </field> <field type="radio" variable="DB_HOST_BROWSABLE"> <description align="left" *************** *** 951,954 **** --- 965,972 ---- </spec> </field> + <field type="staticText" align="left" + txt="If True is selected, then browse to the Postgresql home directory." /> + <field type="staticText" align="left" + txt="If False is selected, then the Postgresql home directory on the target machine should be entered into the combo box manually." /> <field type="search" variable="DB_LOCATION"> <spec txt="Postgresql Home Directory:" type="directory" result="file"> *************** *** 975,983 **** <panel order="8"> <field type="title" txt="Postgresql Server" /> ! <field type="text" variable="DB_NAME"> ! <spec txt="Database Name:" size="20" set="postgres" /> </field> ! <field type="text" variable="DB_USER"> ! <spec txt="Database User:" size="20" set="postgres" /> </field> <field type="password" variable="DB_PASSWORD"> --- 993,1007 ---- <panel order="8"> <field type="title" txt="Postgresql Server" /> ! <field type="rule" variable="DB_NAME"> ! <spec txt="Database Name:" set="0:postgres" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Hostname or IP cannot be blank." /> </field> ! <field type="rule" variable="DB_USER"> ! <spec txt="Database User:" set="0:postgres" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Database User cannot be blank." /> </field> <field type="password" variable="DB_PASSWORD"> *************** *** 1001,1009 **** txt="Both versions of the password must match" /> </field> ! <field type="text" variable="DB_SALT"> ! <spec txt="Password Hash Salt:" size="20" set="abcdefgh" /> </field> ! <field type="text" variable="DB_ITERATIONS"> ! <spec txt="Password Hash Iterations:" size="20" set="13" /> </field> <field type="staticText" align="left" --- 1025,1039 ---- txt="Both versions of the password must match" /> </field> ! <field type="rule" variable="DB_SALT"> ! <spec txt="Password Hash Salt:" set="0:abcdefgh" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Password Hash Salt cannot be blank." /> </field> ! <field type="rule" variable="DB_ITERATIONS"> ! <spec txt="Password Hash Iterations:" set="0:13" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Password Hash Iterations cannot be blank." /> </field> <field type="staticText" align="left" *************** *** 1026,1041 **** <field type="staticText" align="left" txt="After Installtion, it can be moved provided the corresponding property jboss.location in the ant-build.properties file is also updated." /> ! <field type="text" variable="JBOSS_HOST"> ! <spec txt="WebServer Hostname or IP:" size="20" ! set="localhost" /> </field> ! <field type="text" variable="WEBSERVER_HTTP_PORT"> ! <spec txt="WebServer HTTP Port:" size="20" set="8080" /> </field> ! <field type="text" variable="WEBSERVER_HTTPS_PORT"> ! <spec txt="WebServer HTTPS Port:" size="20" set="8443" /> </field> ! <field type="text" variable="WEBSERVER_HTTP_REDIRECTPORT"> ! <spec txt="WebServer Redirect Port:" size="20" set="8443" /> </field> </panel> --- 1056,1082 ---- <field type="staticText" align="left" txt="After Installtion, it can be moved provided the corresponding property jboss.location in the ant-build.properties file is also updated." /> ! <field type="rule" variable="JBOSS_HOST"> ! <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="WebServer Hostname or IP cannot be blank." /> </field> ! <field type="rule" variable="WEBSERVER_HTTP_PORT"> ! <spec txt="WebServer HTTP Port:" set="0:8080" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="WebServer HTTP Port cannot be blank." /> </field> ! <field type="rule" variable="WEBSERVER_HTTPS_PORT"> ! <spec txt="WebServer HTTPS Port:" set="0:8443" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="WebServer HTTPS Port cannot be blank." /> </field> ! <field type="rule" variable="WEBSERVER_HTTP_REDIRECTPOR"> ! <spec txt="WebServer Redirect Port:" set="0:8443" layout="N:5:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="WebServer Redirect Port cannot be blank." /> </field> </panel> |
|
From: Joseph I. <jos...@us...> - 2006-10-03 07:45:17
|
Update of /cvsroot/tolven/tolven/installer In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6802/installer Modified Files: build.xml Log Message: Added validation to prevent blank fields, and enforce some formatting of input fields to the installer. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 3 Oct 2006 04:56:49 -0000 1.11 --- build.xml 3 Oct 2006 07:45:15 -0000 1.12 *************** *** 9,19 **** </target> <target name="create-tolven-install"> <fail unless="izpack.location" /> <mkdir dir="${tolven.location}/build/izpack-8.1" /> <delete file="${tolven.location}/build/izpack-8.1/tolven-install.jar" /> ! <input message="Please enter the build tag, BYYYYMMDD, for the installation directory (e.g. tolvenBYYYYMMDD)" addproperty="build.tag" defaultValue="Home" /> ! <concat destfile="${tolven.location}/build/izpack-8.1/cvstag_dirname_unix.txt">/usr/local/tolven${build.tag}</concat> ! <concat destfile="${tolven.location}/build/izpack-8.1/cvstag_dirname_windows.txt">c:/tolven${build.tag}</concat> <exec dir="izpack-8.1" executable="${izpack.location}/bin/compile.bat" failonerror="true"> <arg line="${tolven.location}/installer/izpack-8.1/tolven-install.xml -b . -o ${tolven.location}/build/izpack-8.1/tolven-install.jar -k standard" /> --- 9,20 ---- </target> + <!-- The installer will be created in ${tolven.location}/build/izpack-8.1 --> <target name="create-tolven-install"> <fail unless="izpack.location" /> <mkdir dir="${tolven.location}/build/izpack-8.1" /> <delete file="${tolven.location}/build/izpack-8.1/tolven-install.jar" /> ! <input message="Please enter the directory name for the installation directory (e.g. tolvenBYYYYMMDD)." addproperty="build.tag" defaultValue="tolvenHome" /> ! <concat destfile="${tolven.location}/build/izpack-8.1/cvstag_dirname_unix.txt">/usr/local/${build.tag}</concat> ! <concat destfile="${tolven.location}/build/izpack-8.1/cvstag_dirname_windows.txt">c:/${build.tag}</concat> <exec dir="izpack-8.1" executable="${izpack.location}/bin/compile.bat" failonerror="true"> <arg line="${tolven.location}/installer/izpack-8.1/tolven-install.xml -b . -o ${tolven.location}/build/izpack-8.1/tolven-install.jar -k standard" /> *************** *** 21,24 **** --- 22,26 ---- </target> + <!-- The installer will be run from ${tolven.location}/build/izpack-8.1 --> <target name="run-tolven-install"> <fail unless="izpack.location" /> |
|
From: Joseph I. <jos...@us...> - 2006-10-03 05:40:28
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21137/installer/izpack-8.1 Modified Files: installUserInputSpec.xml Log Message: True/False radio buttons are used in preference to true and false textfields. Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** installUserInputSpec.xml 3 Oct 2006 04:55:05 -0000 1.2 --- installUserInputSpec.xml 3 Oct 2006 05:40:25 -0000 1.3 *************** *** 8,20 **** set="smtp.mydomain.com" /> </field> ! <field type="text" variable="MAIL_SMTP_AUTH"> <description align="left" ! txt="If the server requires authentication or not. Many public servers now require authentication." /> ! <spec txt="Mail SMTP Auth:" set="true" size="5" /> </field> ! <field type="text" variable="MAIL_DEBUG"> <description align="left" ! txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> ! <spec txt="Mail Debug:" size="5" set="false" /> </field> <field type="rule" variable="MAIL_FROM"> --- 8,30 ---- set="smtp.mydomain.com" /> </field> ! <field type="staticText" align="left" ! txt="If the server requires authentication or not. Many public servers now require authentication." /> ! <field type="radio" variable="MAIL_SMTP_AUTH"> <description align="left" ! txt="Mail SMTP Auth:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> ! <field type="staticText" align="left" ! txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> ! <field type="radio" variable="MAIL_DEBUG"> <description align="left" ! txt="Mail Debug:" /> ! <spec> ! <choice txt="True" value="true" /> ! <choice txt="False" value="false" set="true" /> ! </spec> </field> <field type="rule" variable="MAIL_FROM"> *************** *** 89,97 **** <field type="staticText" align="left" txt="The login page has two different registration links, one for a normally activated login and the other creates a demo user without needing email activation. Two tolven.properties have been added which allows you to configure either or both of these options off. (Turning both off means users can only login to pre-existing accounts)." /> ! <field type="text" variable="CREATE_DEMO_USER"> ! <spec txt="Create Demo User:" size="5" set="true" /> </field> ! <field type="text" variable="ACTIVATE_USER"> ! <spec txt="Activate User:" size="5" set="true" /> </field> <field type="staticText" align="left" --- 99,117 ---- <field type="staticText" align="left" txt="The login page has two different registration links, one for a normally activated login and the other creates a demo user without needing email activation. Two tolven.properties have been added which allows you to configure either or both of these options off. (Turning both off means users can only login to pre-existing accounts)." /> ! <field type="radio" variable="CREATE_DEMO_USER"> ! <description align="left" ! txt="Create Demo User:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> ! <field type="radio" variable="ACTIVATE_USER"> ! <description align="left" ! txt="Activate User:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> <field type="staticText" align="left" |
|
From: Joseph I. <jos...@us...> - 2006-10-03 04:56:51
|
Update of /cvsroot/tolven/tolven/installer In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3355/installer Modified Files: build.xml Log Message: Activated password validation during the installation process. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 3 Oct 2006 04:55:05 -0000 1.10 --- build.xml 3 Oct 2006 04:56:49 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- </fileset> </copy> + <!-- PWDValidator.java is basically the simple validator taken from the IzPack sample directory --> <copy file="izpack-8.1/src-modifications/PWDValidator.java" todir="${izpack.location}/src/lib/com/izforge/izpack/util" /> <ant dir="${izpack.location}" antfile="${izpack.location}/src/build.xml" target="all" /> |
|
From: Joseph I. <jos...@us...> - 2006-10-03 04:55:58
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1/src-modifications In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2809/installer/izpack-8.1/src-modifications Added Files: PWDValidator.java Log Message: Activated password validation during the installation process. --- NEW FILE: PWDValidator.java --- /* * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved. * * http://www.izforge.com/izpack/ * http://developer.berlios.de/projects/izpack/ * * Copyright 2003 Elmar Grom * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package com.izforge.izpack.util; import com.izforge.izpack.panels.ProcessingClient; import com.izforge.izpack.panels.Validator; /*---------------------------------------------------------------------------*/ /** * This class represents a simple validator for passwords to demonstrate * the implementation of a password validator that cooperates with the * password field in the <code>UserInputPanel</code> * * @version 0.0.1 / 02/19/03 * @author Elmar Grom */ /*---------------------------------------------------------------------------*/ public class PWDValidator implements Validator { /*--------------------------------------------------------------------------*/ /** * Validates the contend of multiple password fields. The test * * @param client the client object using the services of this validator. * * @return <code>true</code> if the validation passes, otherwise <code>false</code>. */ /*--------------------------------------------------------------------------*/ public boolean validate (ProcessingClient client) { int numFields = client.getNumFields (); // ---------------------------------------------------- // verify that there is more than one field. If there // is only one field we have to return true. // ---------------------------------------------------- if (numFields < 2) { return (true); } boolean match = true; String content = client.getFieldContents (0); for (int i = 1; i < numFields; i++) { if (!content.equals (client.getFieldContents (i))) { match = false; } } return (match); } } /*---------------------------------------------------------------------------*/ |
|
From: Joseph I. <jos...@us...> - 2006-10-03 04:55:16
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2809/installer/izpack-8.1 Modified Files: installUserInputSpec.xml Log Message: Activated password validation during the installation process. Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** installUserInputSpec.xml 28 Sep 2006 07:14:23 -0000 1.1 --- installUserInputSpec.xml 3 Oct 2006 04:55:05 -0000 1.2 *************** *** 54,58 **** <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 54,58 ---- <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 865,869 **** <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 865,869 ---- <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 890,894 **** <pwd txt="Retype password" size="20" set="secret" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 890,894 ---- <pwd txt="Retype password" size="20" set="secret" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 901,905 **** <pwd txt="Retype password" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 901,905 ---- <pwd txt="Retype password" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 949,953 **** <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 949,953 ---- <pwd txt="Retype Password:" size="20" set="" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 968,972 **** <pwd txt="Retype Password:" size="20" set="postgres" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 968,972 ---- <pwd txt="Retype Password:" size="20" set="postgres" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 978,982 **** <pwd txt="Retype Password:" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 978,982 ---- <pwd txt="Retype Password:" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 1059,1063 **** <pwd txt="Retype password" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.sample.PWDValidator" txt="Both versions of the password must match" /> </field> --- 1059,1063 ---- <pwd txt="Retype password" size="20" set="changeit" /> </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" txt="Both versions of the password must match" /> </field> *************** *** 1143,1181 **** </field> </panel> - <!-- - <panel order="10"> - <createForPack name="deploy-from-stage" /> - <field type="title" txt="Deploy" /> - <field type="staticText" align="left" - txt="Login and password IDs are only required if the stage is to be deployed to a remote server." /> - <field type="staticText" align="left" - txt="They are not used or required for localhost deployment." /> - <field type="text" variable="LDAP_HOST_USER"> - <description align="left" - txt="Please enter the login ID and password to copy credentials to the LDAP Host" /> - <spec txt="User Login ID:" size="20" set="ldap" /> - </field> - <field type="password" variable="LDAP_HOST_PASSWORD"> - <spec> - <pwd txt="Password:" size="20" set="" /> - <pwd txt="Retype Password:" size="20" set="" /> - </spec> - <validator class="com.izforge.sample.PWDValidator" - txt="Both versions of the password must match" /> - </field> - <field type="text" variable="DB_HOST_USER"> - <description align="left" - txt="Please enter the login ID and password to copy credentials to the DB Host" /> - <spec txt="User Login ID:" size="20" set="postgres" /> - </field> - <field type="password" variable="DB_HOST_PASSWORD"> - <spec> - <pwd txt="Password:" size="20" set="" /> - <pwd txt="Retype Password:" size="20" set="" /> - </spec> - <validator class="com.izforge.sample.PWDValidator" - txt="Both versions of the password must match" /> - </field> - </panel> - --> </userInput> \ No newline at end of file --- 1143,1145 ---- |
|
From: Joseph I. <jos...@us...> - 2006-10-03 04:55:14
|
Update of /cvsroot/tolven/tolven/installer In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2809/installer Modified Files: build.xml Log Message: Activated password validation during the installation process. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 2 Oct 2006 03:26:45 -0000 1.9 --- build.xml 3 Oct 2006 04:55:05 -0000 1.10 *************** *** 38,41 **** --- 38,42 ---- </fileset> </copy> + <copy file="izpack-8.1/src-modifications/PWDValidator.java" todir="${izpack.location}/src/lib/com/izforge/izpack/util" /> <ant dir="${izpack.location}" antfile="${izpack.location}/src/build.xml" target="all" /> </target> |
|
From: John C. <jc...@us...> - 2006-10-03 04:41:07
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29638/src/org/tolven/web Modified Files: PersonGenAction.java RegisterAction.java Log Message: Visual cleanup on ephr vs echr for data generator options Index: PersonGenAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/PersonGenAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PersonGenAction.java 31 Aug 2006 23:37:14 -0000 1.14 --- PersonGenAction.java 3 Oct 2006 04:41:05 -0000 1.15 *************** *** 79,83 **** /** Creates a new instance of PersonGenAction */ public PersonGenAction() { ! numberToGenerate = 200; try { --- 79,83 ---- /** Creates a new instance of PersonGenAction */ public PersonGenAction() { ! numberToGenerate = 100; try { Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** RegisterAction.java 2 Oct 2006 05:29:59 -0000 1.16 --- RegisterAction.java 3 Oct 2006 04:41:05 -0000 1.17 *************** *** 104,107 **** --- 104,109 ---- try { + echr = true; // Default == true + ephr = false; InitialContext ctx = new InitialContext(); // J2EE 1.5 has not yet defined exact XML <ejb-ref> syntax for EJB3 |
|
From: John C. <jc...@us...> - 2006-10-03 04:41:07
|
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29638/web/private Modified Files: selectAccount.xhtml adminAccount.xhtml Log Message: Visual cleanup on ephr vs echr for data generator options Index: adminAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/adminAccount.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** adminAccount.xhtml 2 Oct 2006 05:29:59 -0000 1.4 --- adminAccount.xhtml 3 Oct 2006 04:41:05 -0000 1.5 *************** *** 94,110 **** </h:panelGrid> </h:form> ! <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3> ! <p>Generate random patients and add them to this account. Keep the number of patients generated under 500. ! You can always add more patients in a second run (the existing patient will remain in the account). Be patient, this will take several minutes to run.</p> ! <h:form id="patGen"> ! <h:panelGrid columns="2"> ! <h:outputText value="Number of Patients"/> ! <h:inputText id="count" value="#{gen.numberToGenerate}" size="4"/> ! <h:outputText value="Patients began arriving in which year"/> ! <h:inputText id="startYear" value="#{gen.generateHistoryFrom}" size="4"/> ! </h:panelGrid> ! <h:commandButton id="patGenAction" action="#{gen.createCHRPatients}" value="Generate Patients"/> ! </h:form> ! <h:messages globalOnly="true" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </ui:define> </ui:composition> --- 94,123 ---- </h:panelGrid> </h:form> ! <h:panelGroup rendered="#{reg.account.knownType=='echr'}"> ! <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3> ! <p>Generate random patients and add them to this account. Keep the number of patients generated under 200. ! You can always add more patients in a second run (the existing patient will remain in the account). ! Be patient, this will take several minutes to run. The generator creates a lot of data. But you'll notice ! that it doesn't create the exact number of patient specified: The ! generator automatically discards people that haven't been born yet and some but not all people that are deceased. ! Also, the fact that pregnancies result in zero, one or more live births makes the number hard to hit exactly. ! </p> ! <p>As each patient is added to the patient list for the clinical account, each adult patient ! is given a user id consisting of the first and last name of the patient with a dot in between. eg ! Ficticious patient Nancy Cartwright would be given a username and password of nancy.cartwright ! (all lower case). Married couples will have their records in a combined family account. Some family ! accounts also have kids but the kids usually don't have a user id and therefore cannot login. ! Some people will just have one user and one medical record, their own, in an account.</p> ! <h:form id="patGen"> ! <h:panelGrid columns="2"> ! <h:outputText value="Number of Patients"/> ! <h:inputText id="count" value="#{gen.numberToGenerate}" size="4"/> ! <h:outputText value="Patients began arriving in which year"/> ! <h:inputText id="startYear" value="#{gen.generateHistoryFrom}" size="4"/> ! </h:panelGrid> ! <h:commandButton id="patGenAction" action="#{gen.createCHRPatients}" value="Generate Patients"/> ! </h:form> ! <h:messages globalOnly="true" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> ! </h:panelGroup> </ui:define> </ui:composition> Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** selectAccount.xhtml 2 Oct 2006 05:29:59 -0000 1.9 --- selectAccount.xhtml 3 Oct 2006 04:41:05 -0000 1.10 *************** *** 79,89 **** <h:outputText value="Comments"/> </f:facet> </h:column> </h:dataTable> ! <p> ! <h:selectBooleanCheckbox value="#{top.genDemoData}" /> ! <h:outputText value="Add 100 demo patients*"/> ! </p> ! <p>* If checked, 100 new patients will be added to the account you log into. <b>This will take a few minutes.</b> You can add more patients from the Account Administration page under Preferences. </p> --- 79,89 ---- <h:outputText value="Comments"/> </f:facet> + <h:panelGroup rendered="#{item.account.knownType=='echr'}"> + <h:selectBooleanCheckbox value="#{top.genDemoData}" /> + <h:outputText value="Add 100 demo patients*"/> + </h:panelGroup> </h:column> </h:dataTable> ! <p>* If checked, 100 new patients will be added to the clinical account you log into. <b>This will take a few minutes.</b> You can add more patients from the Account Administration page under Preferences. </p> *************** *** 95,98 **** --- 95,104 ---- that go elsewhere for care or decide not to seek further care. Only a few diagnoses are generated (so far). They are generated roughly in proportion to the occurance in the US population.</p> + <p>As each patient is added to the patient list for the clinical account, each adult patient + is given a user id consisting of the first and last name of the patient with a dot in between. eg + Ficticious patient Nancy Cartwright would be given a username and password of nancy.cartwright + (all lower case). Married couples will have their records in a combined family account. Some family + accounts also have kids but the kids usually don't have a user id and therefore cannot login. + Some people will just have one user and one medical record, their own, in an account.</p> </h:panelGroup> </h:form> |
|
From: John C. <jc...@us...> - 2006-10-03 03:14:45
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27148/src/org/tolven/gen/bean Modified Files: GenSource.java RepeatScenario.java GenMedical.java DiseaseGen.java PregnantGen.java DemogMatcher.java CHRGeneratorBean.java Log Message: Fix problem generating babies at the end of pregnancy (I gues some people call that birth:-) but we're just recording the event. The problem was that a null user (author) was passed to the document causing the document to fail. Index: DiseaseGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/DiseaseGen.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DiseaseGen.java 21 Aug 2006 00:26:29 -0000 1.4 --- DiseaseGen.java 3 Oct 2006 03:14:43 -0000 1.5 *************** *** 14,17 **** --- 14,19 ---- package org.tolven.gen.bean; + import java.util.Date; + public class DiseaseGen extends GenSource { *************** *** 32,36 **** this.diseaseName = diseaseName; } ! } --- 34,42 ---- this.diseaseName = diseaseName; } ! @Override ! protected void apply(GenMedical patient, Date eventTime) { ! System.out.println( "Patient " + patient.getFamilyName() + " has " + this.getDiseaseName()); ! super.apply(patient, eventTime); ! } } Index: RepeatScenario.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/RepeatScenario.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RepeatScenario.java 21 Aug 2006 20:25:53 -0000 1.3 --- RepeatScenario.java 3 Oct 2006 03:14:43 -0000 1.4 *************** *** 81,85 **** boolean rslt = false; int count = -startOffset; ! System.out.println( getTitle() + " of " + getScenarioToRepeat().getTitle() + " Ranging from " + clock.getTime() + " to " + endTime); while ( true ) { if (count++ >= MAX_REPEAT) throw new IllegalArgumentException( "Maximum repeat for scenario " + getTitle()); --- 81,85 ---- boolean rslt = false; int count = -startOffset; ! // System.out.println( getTitle() + " of " + getScenarioToRepeat().getTitle() + " Ranging from " + clock.getTime() + " to " + endTime); while ( true ) { if (count++ >= MAX_REPEAT) throw new IllegalArgumentException( "Maximum repeat for scenario " + getTitle()); Index: PregnantGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/PregnantGen.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PregnantGen.java 21 Aug 2006 20:24:45 -0000 1.4 --- PregnantGen.java 3 Oct 2006 03:14:43 -0000 1.5 *************** *** 25,29 **** super.apply(patient, eventTime); Date birthDate = new Date(eventTime.getTime() + getMinimumSpacing()); ! System.out.println( "Pregnancy: " + eventTime + " DOB: " + birthDate + " Spacing: " + getMinimumSpacing()); if (patient.getNow().after(birthDate)) { patient.generateMedicalHistory(eventTime, getDiseaseName(), "Inactive"); --- 25,29 ---- super.apply(patient, eventTime); Date birthDate = new Date(eventTime.getTime() + getMinimumSpacing()); ! System.out.println( "**********Pregnancy: " + eventTime + " DOB: " + birthDate + " Spacing: " + getMinimumSpacing()); if (patient.getNow().after(birthDate)) { patient.generateMedicalHistory(eventTime, getDiseaseName(), "Inactive"); Index: GenSource.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenSource.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GenSource.java 2 Oct 2006 05:30:08 -0000 1.5 --- GenSource.java 3 Oct 2006 03:14:43 -0000 1.6 *************** *** 69,73 **** /** * Call each matcher looking for a match. The first Matcher to match is returned. ! * A probably will be extrated from the patching entry and used to determine if the patient actually * will have this item triggered. * @return a matching child, or null --- 69,73 ---- /** * Call each matcher looking for a match. The first Matcher to match is returned. ! * A probability will be extrated from the matching entry and used to determine if the patient actually * will have this item triggered. * @return a matching child, or null Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/GenMedical.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GenMedical.java 2 Oct 2006 05:30:08 -0000 1.11 --- GenMedical.java 3 Oct 2006 03:14:43 -0000 1.12 *************** *** 41,45 **** public static class PatientMD { ! private MenuData patient = null; MenuStructure msProblem; MenuStructure msProblemSum; --- 41,45 ---- public static class PatientMD { ! MenuData patient = null; MenuStructure msProblem; MenuStructure msProblemSum; *************** *** 59,62 **** --- 59,65 ---- msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getKnownType() + ":activity"); } + if ("ephr".equals(patient.getAccount().getKnownType())) { + msActivity = menu.findMenuStructure( patient.getAccount().getId(), patient.getAccount().getKnownType() + ":family:activity"); + } msProblem = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "problems"); msProblemSum = menu.findDescendentMenuStructure( patient.getAccount().getId(), ms, "overview:summary:probsum"); *************** *** 69,74 **** } ! private PatientMD mdCHR = null; ! private PatientMD mdPHR = null; private Date now = null; private Date dateOfDeath = null; --- 72,77 ---- } ! PatientMD mdCHR = null; ! PatientMD mdPHR = null; private Date now = null; private Date dateOfDeath = null; *************** *** 125,129 **** /** ! * If we cannot determine gender, then we assume thay are neither male nor female. * */ --- 128,132 ---- /** ! * If we cannot determine gender, then we assume they are neither male nor female. * */ *************** *** 136,139 **** --- 139,143 ---- if (gender.toLowerCase().startsWith("m")) male = true; if (gender.toLowerCase().startsWith("f")) female = true; + } *************** *** 296,300 **** recent.setTime(getNow()); recent.add(GregorianCalendar.HOUR, -24*showInActivityIf); ! System.out.println( "Effective: " + test.getEffectiveTime() + "Now-Ndays" + recent.getTime()); if (test.getEffectiveTime().after(recent.getTime())) { // New Activity referencing the result just created --- 300,304 ---- recent.setTime(getNow()); recent.add(GregorianCalendar.HOUR, -24*showInActivityIf); ! // System.out.println( "Effective: " + test.getEffectiveTime() + " Now-Ndays " + recent.getTime()); if (test.getEffectiveTime().after(recent.getTime())) { // New Activity referencing the result just created *************** *** 366,370 **** } ! // /** // * Generate one self-assessment // * @return --- 370,374 ---- } ! // /** // * Generate one self-assessment // * @return *************** *** 398,402 **** } ! // /** // * Generate one Family History item // * @return --- 402,406 ---- } ! // /** // * Generate one Family History item // * @return Index: CHRGeneratorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** CHRGeneratorBean.java 2 Oct 2006 05:30:08 -0000 1.9 --- CHRGeneratorBean.java 3 Oct 2006 03:14:43 -0000 1.10 *************** *** 262,268 **** GregorianCalendar start = new GregorianCalendar(); start.setTime( dob ); ! System.out.print( "Registering baby: " + person.getDob()); ! MenuData mdCHRBaby = registerPatient( null, mother.getCHRAccount(), person, null, mother.getNow(), start.get(GregorianCalendar.YEAR) ); ! MenuData mdPHRBaby = registerPatient( null, mother.getPHRAccount(), person, null, mother.getNow(), start.get(GregorianCalendar.YEAR) ); if (mdCHRBaby!=null && mdPHRBaby!=null) { generateMedicalData( mdCHRBaby, mdPHRBaby, mother.getNow(), mother.getStartYear(), person.getDod()); --- 262,270 ---- GregorianCalendar start = new GregorianCalendar(); start.setTime( dob ); ! System.out.print( "*****Registering baby: " + mother.getFamilyName() + " " + person.getDob()); ! TolvenUser userCHR = mother.mdCHR.patient.getDocument().getAuthor(); ! TolvenUser userPHR = mother.mdPHR.patient.getDocument().getAuthor(); ! MenuData mdCHRBaby = registerPatient( userCHR, mother.getCHRAccount(), person, null, mother.getNow(), start.get(GregorianCalendar.YEAR) ); ! MenuData mdPHRBaby = registerPatient( userPHR, mother.getPHRAccount(), person, null, mother.getNow(), start.get(GregorianCalendar.YEAR) ); if (mdCHRBaby!=null && mdPHRBaby!=null) { generateMedicalData( mdCHRBaby, mdPHRBaby, mother.getNow(), mother.getStartYear(), person.getDod()); *************** *** 343,347 **** } if ("ephr".equals(accountType)) { ! echr.addPatient(account, ccr, account.getKnownType() + ":family", mdpat); } return mdpat; --- 345,349 ---- } if ("ephr".equals(accountType)) { ! echr.addPatient(account, ccr, account.getKnownType() + ":family:members", mdpat); } return mdpat; Index: DemogMatcher.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/DemogMatcher.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DemogMatcher.java 2 Oct 2006 05:30:08 -0000 1.3 --- DemogMatcher.java 3 Oct 2006 03:14:43 -0000 1.4 *************** *** 53,64 **** try { pAge = patient.getAgeInYears(); ! if (pAge < lowAge) return false; // If we're looking for a male, see if this is not one if ("m".equals(getGender())) { ! if (!patient.isMale()) return false; } // If we're looking for a female, see if this is not one if ("f".equals(getGender())) { ! if (!patient.isFemale()) return false; } } catch (ParseException e) { --- 53,74 ---- try { pAge = patient.getAgeInYears(); ! // System.out.println( "Matcher (" + getGender() + "): " + patient.getFamilyName() + " is: " + pAge + " Male: " + patient.isMale() + " Female: " + patient.isFemale() ); ! if (pAge < lowAge) { ! // System.out.println( "Too young " + lowAge); ! return false; ! } // If we're looking for a male, see if this is not one if ("m".equals(getGender())) { ! if (!patient.isMale()) { ! // System.out.println( "Not male "); ! return false; ! } } // If we're looking for a female, see if this is not one if ("f".equals(getGender())) { ! if (!patient.isFemale()) { ! // System.out.println( "Not female "); ! return false; ! } } } catch (ParseException e) { |
|
From: John C. <jc...@us...> - 2006-10-03 03:14:45
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27148/src/org/tolven/doc/entity Modified Files: DocCCR.java Log Message: Fix problem generating babies at the end of pregnancy (I gues some people call that birth:-) but we're just recording the event. The problem was that a null user (author) was passed to the document causing the document to fail. Index: DocCCR.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocCCR.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DocCCR.java 28 Sep 2006 19:06:01 -0000 1.2 --- DocCCR.java 3 Oct 2006 03:14:43 -0000 1.3 *************** *** 113,117 **** public ContinuityOfCareRecord getCCR() throws JAXBException { if (newCCR!=null) { ! System.out.println( "Returning the newCCR root: " + getId()); return newCCR; } --- 113,117 ---- public ContinuityOfCareRecord getCCR() throws JAXBException { if (newCCR!=null) { ! // System.out.println( "Returning the newCCR root: " + getId()); return newCCR; } *************** *** 204,208 **** // when we put it in the CCR document. getActors().put(actor.getActorObjectID(), actor); ! System.out.println( "Adding Actor: " + actor.getActorObjectID()); return actor; } --- 204,208 ---- // when we put it in the CCR document. getActors().put(actor.getActorObjectID(), actor); ! // System.out.println( "Adding Actor: " + actor.getActorObjectID()); return actor; } |
|
From: John C. <jc...@us...> - 2006-10-03 03:14:45
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27148/src/org/tolven/ccr Modified Files: DateTimeType.java Log Message: Fix problem generating babies at the end of pregnancy (I gues some people call that birth:-) but we're just recording the event. The problem was that a null user (author) was passed to the document causing the document to fail. Index: DateTimeType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/ccr/DateTimeType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DateTimeType.java 2 Oct 2006 05:30:08 -0000 1.3 --- DateTimeType.java 3 Oct 2006 03:14:43 -0000 1.4 *************** *** 80,84 **** public Date getDateValue( ) throws ParseException { if (this.exactDateTime==null) return null; ! return iso8601d.parse( this.exactDateTime.substring(0, 10) ); } --- 80,86 ---- public Date getDateValue( ) throws ParseException { if (this.exactDateTime==null) return null; ! String dateString = this.exactDateTime.substring(0, 10); ! // System.out.println( "Date: " + dateString); ! return iso8601d.parse( dateString ); } *************** *** 141,144 **** --- 143,147 ---- // Get age in years int years = n.get(Calendar.YEAR)- b.get(Calendar.YEAR); + // System.out.println( getExactDateTime() + " Age: " + years); return years; } |
|
From: John C. <jc...@us...> - 2006-10-03 03:14:45
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27148/src/org/tolven/app/bean Modified Files: MenuBean.java Log Message: Fix problem generating babies at the end of pregnancy (I gues some people call that birth:-) but we're just recording the event. The problem was that a null user (author) was passed to the document causing the document to fail. Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** MenuBean.java 2 Oct 2006 05:30:08 -0000 1.31 --- MenuBean.java 3 Oct 2006 03:14:43 -0000 1.32 *************** *** 306,312 **** public void addFamilyTab ( MenuStructure root ) { // Family Tab MenuStructure allpatients = new MenuStructure( ! root.getAccount(), root, "patients.xhtml", null, 1, "family", "My Family", "true", "ephr:patient", "tab" ); em.persist( allpatients ); em.persist( new MSColumn( allpatients, 1, "Name", "reference", "%s, %s", "string01,string02") ); --- 306,315 ---- public void addFamilyTab ( MenuStructure root ) { + MenuStructure family = new MenuStructure( + root.getAccount(), root, "bar1.xhtml", null, 1, "family", "My Family", "true", null, "tab" ); + em.persist( family ); // Family Tab MenuStructure allpatients = new MenuStructure( ! root.getAccount(), family, "patients.xhtml", null, 1, "members", "Members", "true", "ephr:patient", "tab" ); em.persist( allpatients ); em.persist( new MSColumn( allpatients, 1, "Name", "reference", "%s, %s", "string01,string02") ); *************** *** 314,317 **** --- 317,330 ---- em.persist( new MSColumn( allpatients, 3, "Age", "date01", "age") ); em.persist( new MSColumn( allpatients, 4, "Sex", "string04", null) ); + // New Activity Tab + MenuStructure activity = new MenuStructure( + root.getAccount(), family, "activity.xhtml", null, 2, "activity", "New Activity", "true", null, "tab" ); + em.persist( activity ); + em.persist( new MSColumn( activity, 1, "Date", "date01", "d MMM yyyy") ); + em.persist( new MSColumn( activity, 2, "For", "parent01", "string01") ); + em.persist( new MSColumn( activity, 3, "Action", "parent02", "string02") ); + em.persist( new MSColumn( activity, 4, "RequestedBy", "string03", null) ); + em.persist( new MSColumn( activity, 5, "Priority", "long01", null) ); + em.persist( new MSColumn( activity, 6, "Due", "date02", "d MMM yyyy") ); } *************** *** 515,522 **** public MenuStructure createDefaultMenuStructure( Account account ) { ! System.out.println( "createDefaultMenuStructure, if needed, for account: " + account.getId()); MenuStructure root = getRootMenuStructure( account); if (root!=null) { ! System.out.println( "MenuStructure already exists"); return root; } --- 528,535 ---- public MenuStructure createDefaultMenuStructure( Account account ) { ! // System.out.println( "createDefaultMenuStructure, if needed, for account: " + account.getId()); MenuStructure root = getRootMenuStructure( account); if (root!=null) { ! // System.out.println( "MenuStructure already exists"); return root; } *************** *** 552,556 **** // account, perf, "test/testUMLS.xhtml", null, 4, "umls", "Concepts", "true", null, "tab" ); // em.persist( umls ); ! System.out.println( "Finished creating DefaultMenuStructure for account: " + account.getId()); return root; --- 565,569 ---- // account, perf, "test/testUMLS.xhtml", null, 4, "umls", "Concepts", "true", null, "tab" ); // em.persist( umls ); ! // System.out.println( "Finished creating DefaultMenuStructure for account: " + account.getId()); return root; |
|
From: John C. <jc...@us...> - 2006-10-03 03:09:22
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25141/src/org/tolven/web Modified Files: MenuAction.java Log Message: Cleanup trace message Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MenuAction.java 2 Oct 2006 05:29:59 -0000 1.20 --- MenuAction.java 3 Oct 2006 03:09:19 -0000 1.21 *************** *** 84,88 **** */ public MenuStructure getThisMenu( ) { ! System.out.println( "[MenuAction] Fetch MenuStructure for account: " + getAccountId() + " path: " + getTargetMenuPath().getPath() ); if (ms==null) ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); // System.out.println( "[MenuAction] MenuStructure fetched for account: " + --- 84,88 ---- */ public MenuStructure getThisMenu( ) { ! // System.out.println( "[MenuAction] Fetch MenuStructure for account: " + getAccountId() + " path: " + getTargetMenuPath().getPath() ); if (ms==null) ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); // System.out.println( "[MenuAction] MenuStructure fetched for account: " + |
3 messages has been excluded from this view by a project administrator.
