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-11 08:47:04
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13297/web/wizard Modified Files: Tag: P_JC_DataEntry3 wizTemplate.xhtml weight.xhtml Log Message: Update Index: wizTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/wizTemplate.xhtml,v retrieving revision 1.6.4.1 retrieving revision 1.6.4.2 diff -C2 -d -r1.6.4.1 -r1.6.4.2 *** wizTemplate.xhtml 10 Mar 2007 04:12:08 -0000 1.6.4.1 --- wizTemplate.xhtml 11 Mar 2007 08:47:02 -0000 1.6.4.2 *************** *** 35,39 **** </script> ! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit2(this);closeTab('#{menu.element}');return false;"> <div class="infobar" > <table width="100%"> --- 35,39 ---- </script> ! <h:form id="#{menu.elementLabel}" onsubmit="ajaxSubmit3(this);return false;"> <div class="infobar" > <table width="100%"> *************** *** 80,83 **** --- 80,84 ---- <tr> <td align="center"> + <h:commandButton action="#{trim.upload}" value="Upload"/> <input id="#{menu.elementLabel}cancelButton" type="submit" value="Cancel" onclick="wizCancel('#{menu.element}');"/> <input id="#{menu.elementLabel}prevButton" type="submit" value="Previous" onclick="prevStep('#{menu.elementLabel}' );self.scrollTo(0, 0);return false;"/> Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/Attic/weight.xhtml,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** weight.xhtml 10 Mar 2007 22:24:00 -0000 1.1.2.2 --- weight.xhtml 11 Mar 2007 08:47:02 -0000 1.1.2.3 *************** *** 33,37 **** Test: #{menu.menuDataItem.string01} <br/> Date: #{menu.menuDataItem.date01} <br/> ! Weight <h:inputText value="#{menu.value}"/> lbs<br/> </div> <div class="help" id="#{menu.elementLabel}help2" style="display:none"> --- 33,37 ---- Test: #{menu.menuDataItem.string01} <br/> Date: #{menu.menuDataItem.date01} <br/> ! Weight <h:inputText value="#{trim.trim.act.observation.value.PQS[0].value}"/> lbs<br/> </div> <div class="help" id="#{menu.elementLabel}help2" style="display:none"> |
|
From: John C. <jc...@us...> - 2007-03-11 08:47:04
|
Update of /cvsroot/tolven/tolvenWEB/web/scripts In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13297/web/scripts Modified Files: Tag: P_JC_DataEntry3 tolven6.js Log Message: Update Index: tolven6.js =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/scripts/tolven6.js,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -C2 -d -r1.13 -r1.13.4.1 *** tolven6.js 16 Feb 2007 04:17:41 -0000 1.13 --- tolven6.js 11 Mar 2007 08:47:02 -0000 1.13.4.1 *************** *** 32,35 **** --- 32,57 ---- } + // Intercept a normal Submit and do it Ajax-style instead. We don't overlay the pane, though. + function ajaxSubmit3(f ) { + var elements = Form.getElements(f); + var queryComponents = new Array(); + for (var i = 0; i < elements.length; i++) { + var queryComponent = Form.Element.serialize(elements[i]); + if (queryComponent) queryComponents.push(queryComponent); + } + queryComponents.push( 'element='+visiblePage ); + // alert( "submit: " + visiblePage ); + // Form.disable( f ); // Don't allow edits or button pushes + var ajax = new Ajax.Request( + f.action, // URL + { // options + method:'post', + evalScripts: false, + postBody: queryComponents.join('&') + }); + return false; + } + + // Intercept a normal Submit and do it Ajax-style instead function ajaxSubmit(b) { *************** *** 226,229 **** --- 248,269 ---- showPane(req.responseText); } + + // Fetch TRIM content of a document from server + function trimGet( element ) { + var instAjax = new Ajax.Request( + 'trimGet.ajaxi', + { + method: 'get', + parameters: 'element='+element, + onComplete: buildForm + }); + // instAjax.setAttribute( "elementId", element ); + } + + + // Once instantiated, we can build the form + function buildForm(req) { + alert( req.responseText ); + } function showPane( paneId ) { |
|
From: Joseph I. <jos...@us...> - 2007-03-10 23:43:55
|
Update of /cvsroot/tolven/tolvenEJB In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15286 Modified Files: Tag: P_JI_RefreshAPK build.xml Log Message: In order to replace the default JBoss CallbackHandler, the class needs to be available to the server before tolven.ear is deployed. A separate tolvenSecurity.jar is now being created. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/build.xml,v retrieving revision 1.17 retrieving revision 1.17.4.1 diff -C2 -d -r1.17 -r1.17.4.1 *** build.xml 8 Mar 2007 16:59:12 -0000 1.17 --- build.xml 10 Mar 2007 23:43:47 -0000 1.17.4.1 *************** *** 3,6 **** --- 3,7 ---- <property file="../tolven/resources/ant-build.properties"/> <path id="project.classpath"> + <pathelement location="${tolvenSecurity.location}/build/tolvenSecurity.jar"/> <pathelement location="${tolvenEJB.location}/bin"/> <!-- JAXB must be before jboss-client --> *************** *** 79,83 **** <include name="*.jar"/> </zipfileset > ! <zipfileset dir="${tolvenEJB.location}/build/bin" includes="**/*.class"/> <zipfileset dir="${tolvenEJB.location}/conf" prefix="META-INF"/> <zipfileset dir="${tolvenEJB.location}/resources/"/> --- 80,84 ---- <include name="*.jar"/> </zipfileset > ! <zipfileset dir="${tolvenEJB.location}/build/bin" includes="**/*.class" excludes="**/AccountUserIdCallback.class" /> <zipfileset dir="${tolvenEJB.location}/conf" prefix="META-INF"/> <zipfileset dir="${tolvenEJB.location}/resources/"/> |
|
From: Joseph I. <jos...@us...> - 2007-03-10 23:43:55
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15286/src/org/tolven/security/auth Removed Files: Tag: P_JI_RefreshAPK AccountUserIdCallback.java Log Message: In order to replace the default JBoss CallbackHandler, the class needs to be available to the server before tolven.ear is deployed. A separate tolvenSecurity.jar is now being created. --- AccountUserIdCallback.java DELETED --- |
|
From: Joseph I. <jos...@us...> - 2007-03-10 23:43:45
|
Update of /cvsroot/tolven/tolvenSecurity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15279 Added Files: Tag: P_JI_RefreshAPK build.xml Log Message: In order to replace the default JBoss CallbackHandler, the class needs to be available to the server before tolven.ear is deployed. A separate tolvenSecurity.jar is now being created. --- NEW FILE: build.xml --- <?xml version="1.0" encoding="UTF-8"?> <project basedir="." default="packaging" name="tolvenSecurity"> <property file="../tolven/resources/ant-build.properties"/> <path id="project.classpath"> <fileset dir="${jboss.location}"> <include name="client/*.jar"/> </fileset> </path> <target name="init"> <delete dir="${tolvenSecurity.location}/build/bin"/> <delete dir="${tolvenSecurity.location}/build/doc"/> <mkdir dir="${tolvenSecurity.location}/build/bin"/> <mkdir dir="${tolvenSecurity.location}/build/doc"/> </target> <target name="clean"> <delete dir="${tolvenSecurity.location}/build"/> </target> <target name="compile" depends="init"> <echo message="${ant.project.name}: ${ant.file}"/> <javac destdir="${tolvenSecurity.location}/build/bin" debug="true" > <src path="${tolvenSecurity.location}/src"/> <classpath refid="project.classpath"/> </javac> </target> <target name="packaging" depends="compile" description="tolvenSecurity.jar"> <jar destfile="${tolvenSecurity.location}/build/tolvenSecurity.jar"> <zipfileset dir="${tolvenSecurity.location}/build/bin" includes="org/tolven/web/security/auth/UsernamePasswordAccountUserIdCallbackHandler.class"/> <zipfileset dir="${tolvenSecurity.location}/build/bin" includes="org/tolven/security/auth/AccountUserIdCallback.class"/> </jar> </target> <target name="javadoc" description="Generate Javadoc"> <javadoc access="public" author="true" destdir="${tolvenSecurity.location}/build/doc" doctitle="Tolven Security" packagenames="*" source="1.5" sourcepath="${tolvenSecurity.location}/src" splitindex="true" use="true" version="true"/> </target> </project> |
|
From: Joseph I. <jos...@us...> - 2007-03-10 22:45:40
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22896/src/org/tolven/security/auth Modified Files: Tag: P_JI_RefreshAPK AccountUserIdCallback.java Log Message: Made the constructor public Index: AccountUserIdCallback.java =================================================================== RCS file: /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth/Attic/AccountUserIdCallback.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** AccountUserIdCallback.java 10 Mar 2007 21:00:51 -0000 1.1.2.1 --- AccountUserIdCallback.java 10 Mar 2007 22:45:39 -0000 1.1.2.2 *************** *** 26,30 **** private long accountUserId; ! AccountUserIdCallback(String prompt) { this.prompt = prompt; } --- 26,30 ---- private long accountUserId; ! public AccountUserIdCallback(String prompt) { this.prompt = prompt; } |
|
From: John C. <jc...@us...> - 2007-03-10 22:31:06
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16601/resources/rules Modified Files: Tag: P_JC_DataEntry3 ephr.drl Log Message: update Index: ephr.drl =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/ephr.drl,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** ephr.drl 10 Mar 2007 04:13:26 -0000 1.2.2.1 --- ephr.drl 10 Mar 2007 22:31:04 -0000 1.2.2.2 *************** *** 141,144 **** --- 141,145 ---- end + /* Simple rule that displays all placeholders we know about rule "Display MS placeholders" when *************** *** 147,150 **** --- 148,152 ---- System.out.println( "Placeholder: " + $ms.getPath( )); end + */ /* Not a very interesting rule right now |
|
From: John C. <jc...@us...> - 2007-03-10 22:31:06
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16601/src/org/tolven/app/bean Modified Files: Tag: P_JC_DataEntry3 CreatorBean.java Log Message: update Index: CreatorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** CreatorBean.java 10 Mar 2007 04:13:27 -0000 1.5.2.1 --- CreatorBean.java 10 Mar 2007 22:31:05 -0000 1.5.2.2 *************** *** 234,237 **** --- 234,238 ---- contextList.add(new MenuPath(context)); scanTrim( trim, contextList); + trim.setDocumentId( docXML.getId()); // OK, now put the finished TRIM back into XML and store in the document. ByteArrayOutputStream trimXML = new ByteArrayOutputStream() ; |
Update of /cvsroot/tolven/tolvenWEB/web/tab In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/web/tab Removed Files: Tag: P_JC_DataEntry3 voc.xhtml testFamily.xhtml phrInbox.xhtml phrRecList.xhtml prefDemog.xhtml prefPhotos.xhtml news.xhtml genNewUser.xhtml opensrc.xhtml platform.xhtml mission.xhtml testLDAP.xhtml patOver.xhtml familyDetail.xhtml echr.xhtml testUMLS.xhtml userDemog.xhtml genPerson.xhtml photoDetail.xhtml ephr.xhtml dummyDetail.xhtml sw.xhtml dummy.xhtml Log Message: update --- prefPhotos.xhtml DELETED --- --- mission.xhtml DELETED --- --- testUMLS.xhtml DELETED --- --- news.xhtml DELETED --- --- userDemog.xhtml DELETED --- --- familyDetail.xhtml DELETED --- --- testFamily.xhtml DELETED --- --- platform.xhtml DELETED --- --- opensrc.xhtml DELETED --- --- photoDetail.xhtml DELETED --- --- dummy.xhtml DELETED --- --- dummyDetail.xhtml DELETED --- --- sw.xhtml DELETED --- --- echr.xhtml DELETED --- --- voc.xhtml DELETED --- --- phrRecList.xhtml DELETED --- --- testLDAP.xhtml DELETED --- --- genPerson.xhtml DELETED --- --- ephr.xhtml DELETED --- --- patOver.xhtml DELETED --- --- genNewUser.xhtml DELETED --- --- phrInbox.xhtml DELETED --- --- prefDemog.xhtml DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-10 22:24:03
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/web/wizard Modified Files: Tag: P_JC_DataEntry3 weight.xhtml gcs.xhtml observation.xhtml Log Message: update Index: gcs.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/gcs.xhtml,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** gcs.xhtml 12 Feb 2007 07:12:29 -0000 1.5 --- gcs.xhtml 10 Mar 2007 22:24:00 -0000 1.5.4.1 *************** *** 53,57 **** <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Assessment Time (T)</legend> ! <h:inputText id="gcsT" value="#{trim.trim.acts[0].effectiveTime.TS[0]}" size="30"/> <!-- input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value="" size="30"/--><br /> <a href="javascript:addHours('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1h</a> --- 53,57 ---- <div align="right" style="margin-top:5px; padding-top:5px; float:right"><a title="More information" href="javascript:toggleHelp('#{menu.elementLabel}','time');"><img src="../images/img_help_t.jpg" border="0" /></a></div> <legend>Assessment Time (T)</legend> ! <h:inputText id="gcsT" value="#{trim.trim.act.effectiveTime.TS[0]}" size="30"/> <!-- input id="#{menu.elementLabel}gcsT" name="#{menu.elementLabel}gcsT" readonly="true" type="text" value="" size="30"/--><br /> <a href="javascript:addHours('#{menu.elementLabel}:gcsT',-1);#{menu.elementLabel}computeGCS($('#{menu.elementLabel}:gcsT'));">-1h</a> Index: observation.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/observation.xhtml,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** observation.xhtml 10 Mar 2007 04:12:08 -0000 1.2.4.1 --- observation.xhtml 10 Mar 2007 22:24:01 -0000 1.2.4.2 *************** *** 17,21 **** <ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/> <ui:define name="steps"> ! <ui:include src="../wizard/#{trim.trim.page}"/> </ui:define> </ui:composition> --- 17,21 ---- <ui:param name="subject" value="#{menu.menuDataItem.parent01.string02} #{menu.menuDataItem.parent01.string01}"/> <ui:define name="steps"> ! <ui:include src="../wizard/#{trim.trim.page}"/> </ui:define> </ui:composition> Index: weight.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/wizard/Attic/weight.xhtml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** weight.xhtml 10 Mar 2007 04:12:08 -0000 1.1.2.1 --- weight.xhtml 10 Mar 2007 22:24:00 -0000 1.1.2.2 *************** *** 42,53 **** </c:if> <div class="step" title="Finalize" > ! <div class="pagesm"> ! <p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting ! is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step ! to display on a post-submission drilldown.</p> ! Test: #{menu.menuDataItem.string01} <br/> ! Date: #{menu.menuDataItem.date01} <br/> ! Weight: #{menu.menuDataItem.pqStringVal01} #{menu.menuDataItem.pqUnits01} <br/> ! </div> <div class="help" id="#{menu.elementLabel}help3" style="display:none"> <h1>Finalize</h1> --- 42,51 ---- </c:if> <div class="step" title="Finalize" > ! <p>NOTE: This summary step is always a reflection of what's on the server - in other words, submitting ! is always a matter of submitting what is already safely committed to the database. As such, this is the only sensible step ! to display on a post-submission drilldown.</p> ! <ui:include src="/five/drilldown/weightDD.xhtml"> ! <ui:param name="act" value="#{trim.trim.act}"/> ! </ui:include> <div class="help" id="#{menu.elementLabel}help3" style="display:none"> <h1>Finalize</h1> |
|
From: John C. <jc...@us...> - 2007-03-10 22:24:03
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/src/org/tolven/ajax Modified Files: Tag: P_JC_DataEntry3 InstantiateServlet.java Log Message: update Index: InstantiateServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/InstantiateServlet.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** InstantiateServlet.java 10 Mar 2007 04:12:08 -0000 1.3.2.1 --- InstantiateServlet.java 10 Mar 2007 22:24:01 -0000 1.3.2.2 *************** *** 2,8 **** --- 2,10 ---- import java.io.IOException; + import java.io.InputStream; import java.io.Writer; import java.util.Date; import java.util.HashMap; + import java.util.List; import java.util.Map; *************** *** 26,29 **** --- 28,35 ---- import javax.xml.bind.JAXBException; + import org.apache.commons.fileupload.FileItem; + import org.apache.commons.fileupload.FileUploadException; + import org.apache.commons.fileupload.disk.DiskFileItemFactory; + import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.jboss.logging.Logger; import org.tolven.app.CreatorLocal; *************** *** 34,45 **** import org.tolven.core.entity.Status; import org.tolven.doc.DocumentLocal; import org.tolven.gen.PersonGenerator; import org.tolven.trim.util.TRIMException; import org.tolven.voc.umls.ConceptDAO; import org.tolven.web.TopAction; public class InstantiateServlet extends HttpServlet { private CreatorLocal creatorBean; ! private MenuLocal menuLocal; private ServletContext context = null; --- 40,57 ---- import org.tolven.core.entity.Status; import org.tolven.doc.DocumentLocal; + import org.tolven.doc.XMLLocal; + import org.tolven.doc.entity.DocBase; + import org.tolven.doc.entity.DocImage; import org.tolven.gen.PersonGenerator; import org.tolven.trim.util.TRIMException; import org.tolven.voc.umls.ConceptDAO; import org.tolven.web.TopAction; + import org.tolven.web.security.VestibuleSecurityFilter; public class InstantiateServlet extends HttpServlet { private CreatorLocal creatorBean; ! private MenuLocal menuBean; ! private DocumentLocal docBean; ! private XMLLocal xmlBean; private ServletContext context = null; *************** *** 54,58 **** InitialContext ctx = new InitialContext(); creatorBean = (CreatorLocal) ctx.lookup("tolven/CreatorBean/local"); ! menuLocal = (MenuLocal) ctx.lookup("tolven/MenuBean/local"); } catch (NamingException e) --- 66,72 ---- InitialContext ctx = new InitialContext(); creatorBean = (CreatorLocal) ctx.lookup("tolven/CreatorBean/local"); ! menuBean = (MenuLocal) ctx.lookup("tolven/MenuBean/local"); ! docBean = (DocumentLocal) ctx.lookup("tolven/DocumentBean/local"); ! xmlBean = (XMLLocal) ctx.lookup("tolven/XMLBean/local"); } catch (NamingException e) *************** *** 85,89 **** if (uri.endsWith("wizSubmit.ajaxi")) { String element = req.getParameter( "element"); ! MenuData md = menuLocal.findMenuDataItem(accountUser.getAccount().getId(), element); if (md.getStatus()==Status.NEW) { creatorBean.submit(md); --- 99,103 ---- if (uri.endsWith("wizSubmit.ajaxi")) { String element = req.getParameter( "element"); ! MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element); if (md.getStatus()==Status.NEW) { creatorBean.submit(md); *************** *** 103,110 **** // MenuPath path = new MenuPath( element ); // System.out.println( "Milestone 1" ); ! MenuData md = menuLocal.findMenuDataItem(accountUser.getAccount().getId(), element); // System.out.println( "Milestone 2" ); if (md.getStatus()==Status.NEW) { ! menuLocal.removeReferencingMenuData( md.getAccount().getId(), md.getDocumentId()); } // System.out.println( "Milestone 3" ); --- 117,124 ---- // MenuPath path = new MenuPath( element ); // System.out.println( "Milestone 1" ); ! MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element); // System.out.println( "Milestone 2" ); if (md.getStatus()==Status.NEW) { ! menuBean.removeReferencingMenuData( md.getAccount().getId(), md.getDocumentId()); } // System.out.println( "Milestone 3" ); *************** *** 115,119 **** } ! // Instantiation request from browser if (uri.endsWith("instantiate.ajaxi")) { // writer.write( "<element>" ); --- 129,146 ---- } ! // Browser requests TRIM XML ! if (uri.endsWith("trimGet.ajaxi")) { ! // writer.write( "<element>" ); ! // The MenuStructureItem to use ! String element = req.getParameter( "element"); ! if (element == null ) throw new IllegalArgumentException( "Missing element in TRIM request"); ! MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element); ! DocBase doc = docBean.findDocument( md.getDocumentId()); ! writer.write(doc.getContentString()); ! writer.close(); ! return; ! } ! ! // Instantiation request from browser if (uri.endsWith("instantiate.ajaxi")) { // writer.write( "<element>" ); *************** *** 126,130 **** MenuData md; md = creatorBean.createTRIMInstance(accountUser.getAccount().getId(), templateId, context, now ); ! writer.write(md.getPath()); // writer.write( "</element>" ); writer.close(); --- 153,157 ---- MenuData md; md = creatorBean.createTRIMInstance(accountUser.getAccount().getId(), templateId, context, now ); ! writer.write(md.getPath()); // writer.write( "</element>" ); writer.close(); *************** *** 138,144 **** throw new ServletException( "Exception thrown in IntantiateServlet", e); } - } } --- 165,191 ---- throw new ServletException( "Exception thrown in IntantiateServlet", e); } } + @Override + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String uri = request.getRequestURI(); + AccountUser accountUser = (AccountUser) request.getAttribute("accountUser"); + response.setContentType("text/xml"); + response.setHeader("Cache-Control", "no-cache"); + Writer writer=response.getWriter(); + Date now = (Date) request.getAttribute("tolvenNow"); + + // Browser puts TRIM XML + if (uri.endsWith("trimPut.ajaxi")) { + // writer.write( "<element>" ); + // The MenuStructureItem to use + String element = request.getParameter( "element"); + if (element == null ) throw new IllegalArgumentException( "Missing element in TRIM request"); + MenuData md = menuBean.findMenuDataItem(accountUser.getAccount().getId(), element); + DocBase doc = docBean.findDocument( md.getDocumentId()); + request.getInputStream(); + // writer.write( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<html>\n" + + } + } } |
|
From: John C. <jc...@us...> - 2007-03-10 22:24:02
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/web/five Modified Files: Tag: P_JC_DataEntry3 resultSummary.xhtml Log Message: update Index: resultSummary.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/resultSummary.xhtml,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** resultSummary.xhtml 4 Dec 2006 08:59:00 -0000 1.2 --- resultSummary.xhtml 10 Mar 2007 22:24:01 -0000 1.2.4.1 *************** *** 31,35 **** <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> --- 31,35 ---- <h:outputText value="More..." style="COLOR: #333333; TEXT-DECORATION: none; FONT-SIZE: 75%;TEXT-ALIGN: right;"/> </h:outputLink> ! <h:outputText rendered="#{menu.menuDataCount==0}" value="No New Lab Results" style="COLOR: #333333; FONT-SIZE: 75%;TEXT-ALIGN: center;"/> </ui:composition> </body> |
|
From: John C. <jc...@us...> - 2007-03-10 22:24:02
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/web/WEB-INF Modified Files: Tag: P_JC_DataEntry3 web.xml Log Message: update Index: web.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/web.xml,v retrieving revision 1.25 retrieving revision 1.25.2.1 diff -C2 -d -r1.25 -r1.25.2.1 *** web.xml 8 Mar 2007 17:03:43 -0000 1.25 --- web.xml 10 Mar 2007 22:24:01 -0000 1.25.2.1 *************** *** 196,207 **** </servlet-mapping> ! <session-config><session-timeout> ! 300 ! </session-timeout> </session-config> <welcome-file-list> ! <welcome-file> ! index.jsp ! </welcome-file> </welcome-file-list> <security-constraint> --- 196,204 ---- </servlet-mapping> ! <session-config> ! <session-timeout>60</session-timeout> </session-config> <welcome-file-list> ! <welcome-file>index.jsp</welcome-file> </welcome-file-list> <security-constraint> |
|
From: John C. <jc...@us...> - 2007-03-10 22:24:02
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13497/web/five/drilldown Added Files: Tag: P_JC_DataEntry3 weightDD.xhtml Log Message: update --- NEW FILE: weightDD.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Patient Weight - Drilldown</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> </head> <body> <ui:composition> <div class="pagesm"> #{act.title.ST.value}<br/> Date of Observation: #{act.effectiveTime.TS[0]} <br/> Value: #{act.observation.value.PQS[0].value} #{act.observation.value.PQS[0].unit} <br/> Device: <br/> Clothing: <br/> </div> </ui:composition> </body> </html> |
|
From: John C. <jc...@us...> - 2007-03-10 22:23:56
|
Update of /cvsroot/tolven/tolvenWEB/web/five/drilldown In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13484/web/five/drilldown Log Message: Directory /cvsroot/tolven/tolvenWEB/web/five/drilldown added to the repository --> Using per-directory sticky tag `P_JC_DataEntry3' |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:53
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11029/src/org/tolven/web/security/auth Added Files: Tag: P_JI_RefreshAPK UsernamePasswordAccountUserIdCallbackHandler.java Log Message: In order to replace the default JBoss CallbackHandler, the class needs to be available to the server before tolven.ear is deployed. --- NEW FILE: UsernamePasswordAccountUserIdCallbackHandler.java --- /* * Copyright (C) 2006 Tolven Inc * * This library is free software; you can redistribute it and/or modify it under the terms of * the GNU Lesser General Public License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * Contact: in...@to... */ package org.tolven.web.security.auth; import java.lang.reflect.Method; import java.io.IOException; import java.security.Principal; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.jacc.PolicyContext; import javax.security.jacc.PolicyContextException; import javax.servlet.http.HttpServletRequest; import org.tolven.security.auth.AccountUserIdCallback; /** * This class provides a way to supply the username, password and optionally the accountUserId to LoginModules via the CallbackHandler interface * @author Joseph Isaac * */ public class UsernamePasswordAccountUserIdCallbackHandler implements CallbackHandler { public static final String ACCOUNTUSER_ID = "accountUserId"; private Principal principal; private Object credential; public UsernamePasswordAccountUserIdCallbackHandler() { } public UsernamePasswordAccountUserIdCallbackHandler(Principal principal, Object credential) { this.principal = principal; this.credential = credential; } public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { int len = callbacks.length; Callback cb; for (int i = 0; i < len; i++) { cb = callbacks[i]; if (cb instanceof NameCallback) { NameCallback ncb = (NameCallback) cb; ncb.setName(principal.getName()); } else if (cb instanceof PasswordCallback) { PasswordCallback pcb = (PasswordCallback) cb; pcb.setPassword(getPassword()); } else if (cb instanceof org.tolven.security.auth.AccountUserIdCallback) { AccountUserIdCallback pcb = (AccountUserIdCallback) cb; try { HttpServletRequest request = (HttpServletRequest) PolicyContext.getContext("javax.servlet.http.HttpServletRequest"); if (request != null) { Object obj = request.getSession().getAttribute(ACCOUNTUSER_ID); if (obj == null) { pcb.setAccountUserId(0L); } else { pcb.setAccountUserId((Long) obj); } } } catch (PolicyContextException ex) { ex.printStackTrace(); throw new RuntimeException(ex); } } else { throw new UnsupportedCallbackException(cb, "Unsupported Callback Exception"); } } } public void setSecurityInfo(Principal principal, Object credential) { this.principal = principal; this.credential = credential; } private char[] getPassword() { char[] password = null; if (credential instanceof char[]) { password = (char[]) credential; } else if (credential instanceof String) { String s = (String) credential; password = s.toCharArray(); } else { try { Class[] types = {}; Method m = credential.getClass().getMethod("toCharArray", types); Object[] args = {}; password = (char[]) m.invoke(credential, args); } catch (Exception e) { if (credential != null) { String s = credential.toString(); password = s.toCharArray(); } } } return password; } } |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:52
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11029/src/org/tolven/security/auth Added Files: Tag: P_JI_RefreshAPK AccountUserIdCallback.java Log Message: In order to replace the default JBoss CallbackHandler, the class needs to be available to the server before tolven.ear is deployed. --- NEW FILE: AccountUserIdCallback.java --- /* * Copyright (C) 2006 Tolven Inc * * This library is free software; you can redistribute it and/or modify it under the terms of * the GNU Lesser General Public License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * Contact: in...@to... */ package org.tolven.security.auth; import java.io.Serializable; import javax.security.auth.callback.Callback; /** * This class provides a way to supply the AccountUserId to a LoginModule * @author Joseph Isaac * */ public class AccountUserIdCallback implements Callback, Serializable { private String prompt; private long accountUserId; AccountUserIdCallback(String prompt) { this.prompt = prompt; } /** * Return a prompt * @return */ public String getPrompt() { return prompt; } /** * Return the accountUserId * @return */ public long getAccountUserId() { return accountUserId; } /** * Set the accountUserId * @param accountUserId */ public void setAccountUserId(long accountUserId) { this.accountUserId = accountUserId; } } |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:52
|
Update of /cvsroot/tolven/tolvenSecurity/src/org In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven/web Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven/web added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven/web/security/auth Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security/auth added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven/web/security Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven/web/security added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven/security/auth Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven/security/auth added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 21:00:50
|
Update of /cvsroot/tolven/tolvenSecurity/src/org/tolven/security In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10966/src/org/tolven/security Log Message: Directory /cvsroot/tolven/tolvenSecurity/src/org/tolven/security added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 20:56:15
|
Update of /cvsroot/tolven/tolvenSecurity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9199 Added Files: .cvsignore Log Message: Ensure the usual files do not make it to cvs --- NEW FILE: .cvsignore --- .externalToolBuilders .settings bin .classpath .packaging .project build |
3 messages has been excluded from this view by a project administrator.
