tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolven/installer/izpack-8.1/bin - New directory

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

Update of /cvsroot/tolven/tolven/installer/izpack-8.1/bin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30601/installer/izpack-8.1/bin

Log Message:
Directory /cvsroot/tolven/tolven/installer/izpack-8.1/bin added to the repository

[Tolven-cvs-commit] tolven/installer/izpack-8.1/lib - New directory

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

Update of /cvsroot/tolven/tolven/installer/izpack-8.1/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30601/installer/izpack-8.1/lib

Log Message:
Directory /cvsroot/tolven/tolven/installer/izpack-8.1/lib added to the repository

[Tolven-cvs-commit] tolven/installer/izpack-8.1 deployTolvenEARProcessPanelSpec.xml, NONE, 1.1 deploy-tolvenEAR.xml, NONE, 1.1

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

Update of /cvsroot/tolven/tolven/installer/izpack-8.1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16545/installer/izpack-8.1

Added Files:
	deployTolvenEARProcessPanelSpec.xml deploy-tolvenEAR.xml 
Log Message:
Experimental targets and code for using IzPack to deploy

--- NEW FILE: deployTolvenEARProcessPanelSpec.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<processing>
	<job name="deploy-tolvenEAR">
		<executefile name="c:/apache-ant-1.6.5/bin/ant.bat">
			<arg>-Dbasedir=c:/tolvenB20060927/tolven</arg>
			<arg>-buildfile</arg>
			<arg>c:/tolvenB20060927/tolven/build.xml</arg>
			<arg>deploy</arg>
		</executefile>
	</job>
</processing>
--- NEW FILE: deploy-tolvenEAR.xml ---
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
<installation version="1.0">
	<info>tolvenB20060927
		<appname>Tolven Stage Installation</appname>
		<appversion>alpha1</appversion>
		<appsubpath>tolvenhome</appsubpath>
		<authors>
			<author name="John Churin"
				email="joh...@to..." />
			<author name="Joseph Isaac"
				email="jos...@to..." />
		</authors>
		<uninstaller>uninstall-tolven.jar</uninstaller>
		<url>http://www.tolvenhealth.org/</url>
		<javaversion>1.5</javaversion>
	</info>

	<guiprefs width="800" height="600" resizable="no" />

	<locale>
		<langpack iso3="eng" />
	</locale>

	<resources>
		<res id="ProcessPanel.Spec.xml" src="deployTolvenEARProcessPanelSpec.xml" />
	</resources>

	<panels>
		<panel classname="ProcessPanel" />
	</panels>

	<packs>
		<pack name="deploy-or-undeploy-tolvenEAR" preselected="no" required="no">
			<description>Deploy/Undeploy Tolven EAR</description>
		</pack>
	</packs>
</installation>

[Tolven-cvs-commit] tolven/installer build.xml,1.3,1.4

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

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

Modified Files:
	build.xml 
Log Message:
Experimental targets and code for using IzPack to deploy

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	28 Sep 2006 22:47:14 -0000	1.3
--- build.xml	29 Sep 2006 05:31:29 -0000	1.4
***************
*** 46,49 ****
--- 46,67 ----
  	</target>
  
+ 	<!-- Experimental target -->
+ 	<target name="create-deploy-tolvenEAR">
+ 		<fail unless="izpack.location" />
+ 		<mkdir dir="${tolven.location}/build/izpack-8.1" />
+ 		<delete file="${tolven.location}/build/izpack-8.1/deploy-tolvenEAR.jar" />
+ 		<exec dir="izpack-8.1" executable="${izpack.location}/bin/compile.bat" failonerror="true">
+ 			<arg line="${tolven.location}/installer/izpack-8.1/deploy-tolvenEAR.xml -b . -o ${tolven.location}/build/izpack-8.1/deploy-tolvenEAR.jar -k standard" />
+ 		</exec>
+ 	</target>
+ 
+ 	<!-- Experimental target -->
+ 	<target name="run-deploy-tolvenEAR">
+ 		<fail unless="izpack.location" />
+ 		<exec dir="${tolven.location}/build/izpack-8.1" executable="java">
+ 			<arg line="-DTRACE=true -DSTACKTRACE=true -jar deploy-tolvenEAR.jar" />
+ 		</exec>
+ 	</target>
+ 
  	<target name="update-IzPack-with-tolven-src">
  		<fail unless="izpack.location" />

[Tolven-cvs-commit] tolven/installer/izpack-8.1 tolven-util-install.xml, 1.1, 1.2

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

Update of /cvsroot/tolven/tolven/installer/izpack-8.1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13697/installer/izpack-8.1

Modified Files:
	tolven-util-install.xml 
Log Message:
Removed an extra angled end bracket...seemed harmless but a typo anyway

Index: tolven-util-install.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-util-install.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tolven-util-install.xml	28 Sep 2006 07:14:23 -0000	1.1
--- tolven-util-install.xml	29 Sep 2006 05:24:51 -0000	1.2
***************
*** 35,39 ****
  
  	<panels>
! 		<panel classname="HelloPanel" />>
  		<panel classname="InfoPanel" />
  		<panel classname="LicencePanel" />
--- 35,39 ----
  
  	<panels>
! 		<panel classname="HelloPanel" />
  		<panel classname="InfoPanel" />
  		<panel classname="LicencePanel" />

[Tolven-cvs-commit] tolven/installer build.xml,1.2,1.3

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

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

Modified Files:
	build.xml 
Log Message:
Use exec instead of java...will fix the java tag code later

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	28 Sep 2006 19:00:53 -0000	1.2
--- build.xml	28 Sep 2006 22:47:14 -0000	1.3
***************
*** 20,28 ****
  	<target name="run-tolven-install">
  		<fail unless="izpack.location" />
- 		<java jar="${tolven.location}/build/izpack-8.1/tolven-install.jar" fork="true" failonerror="true">
- 			<arg value="-DTRACE" />
- 			<arg value="-DSTACKTRACE=true" />
- 			<arg value="-jar" />
- 		</java>
  		<exec dir="${tolven.location}/build/izpack-8.1" executable="java">
  			<arg line="-DTRACE=true -DSTACKTRACE=true -jar tolven-install.jar" />
--- 20,23 ----
***************
*** 46,54 ****
  	<target name="run-tolven-util-install">
  		<fail unless="izpack.location" />
- 		<java jar="${tolven.location}/build/izpack-8.1/tolven-util-install.jar" fork="true" failonerror="true">
- 			<arg value="-DTRACE" />
- 			<arg value="-DSTACKTRACE=true" />
- 			<arg value="-jar" />
- 		</java>
  		<exec dir="${tolven.location}/build/izpack-8.1" executable="java">
  			<arg line="-DTRACE=true -DSTACKTRACE=true -jar tolven-util-install.jar" />
--- 41,44 ----

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web CCRAction.java, 1.1, NONE

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

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

Removed Files:
	CCRAction.java 
Log Message:
Moved to .ccr package

--- CCRAction.java DELETED ---

[Tolven-cvs-commit] ctomClient jndi.properties, NONE, 1.1 Test2.java, NONE, 1.1 .project, NONE, 1.1 .classpath, NONE, 1.1 Test1.java, NONE, 1.1

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

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

Added Files:
	jndi.properties Test2.java .project .classpath Test1.java 
Log Message:
Simple client test programs to excercise NCI's clinical Trial Object Model (CTOM) in tolven app server.
Checked in as an Eclipse project

--- NEW FILE: jndi.properties ---
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
java.naming.provider.url=jnp://localhost:1099
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
--- NEW FILE: Test1.java ---
import java.util.Date;

import javax.naming.InitialContext;

import org.tolven.ctom.CTOMRemote;
import org.tolven.ctom.entity.Study;
import org.tolven.ctom.entity.StudySite;
import org.tolven.ctom.entity.Subject;
import org.tolven.ctom.entity.SubjectAssignment;
import org.tolven.gen.PersonGeneratorRemote;
import org.tolven.gen.entity.VirtualPerson;

/**
 * Test CTOM persistence in Tolven.
 * Create a study, add a couple study sites to it, add some subjects to each study site.
 * Then pass the object graph to the application server where it is persisted.
 * @author John Churin
 *
 */
public class Test1 {
	public static int STUDY_SITES = 2;
	public static int SUBJECTS = 30;
	
	/**
	 * @param args
	 * @throws Exception 
	 */
	public static void main(String[] args) throws Exception {
		InitialContext ctx = new InitialContext();
		Date now = new Date();
		// Bind to the remote session bean interface in the running server via JNDI/RMI
		CTOMRemote ctom = (CTOMRemote) ctx.lookup("tolven/CTOMBean/remote");
		PersonGeneratorRemote personGen = (PersonGeneratorRemote) ctx.lookup("tolven/PersonGeneratorDAO/remote");

		long startTime = System.nanoTime();
		// Create a study
		Study study = new Study();
		study.setShortTitle("A Simple study at " + new Date());
		study.setDescription("Testing CTOM Model");
		study.setTargetAccrualNumber(100);
		// Create a study site
		for (int ss = 0; ss < STUDY_SITES; ss++) {
			StudySite site = new StudySite( );
			site.setStatus("active");
			study.addStudySite(site);
	
			// Add subjects to the study site
	    	for (int s = 0; s < SUBJECTS; s++) {
	    		VirtualPerson person = personGen.generatePerson();
	    		// Ignore people not yet born and already dead.
	    		int age = person.getAgeInYears(now);
	    		if (age < 1) continue;
	    		if (person.getDod().before(now)) continue;
	    		// Create a subject
				Subject subject = new Subject();
	    		subject.setAdministrativeGenderCode(person.getGender());
	    		subject.setLastName(person.getLast());
	    		subject.setFirstName(person.getFirst());
				SubjectAssignment sa = new SubjectAssignment(); 
				sa.setStudySubjectIdentifier(s+1);
				sa.setAgeAtEnrollment(age );
				// Assign the subject to study
				sa.setSubject(subject);
				// Add this subject to the study site
				site.addSubjectAssignment(sa);
	    	}
		}
		// Add Study (and the objects below it) to the database
		long studyId = ctom.persist(study);
		long endTime = System.nanoTime();
		System.out.format("Study %d created in %dms", studyId, (endTime-startTime)/1000000);
	}

}

--- NEW FILE: .classpath ---
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path=""/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry combineaccessrules="false" kind="src" path="/tolvenEJB"/>
	<classpathentry kind="output" path=""/>
</classpath>

--- NEW FILE: Test2.java ---
import java.util.List;

import javax.naming.InitialContext;

import org.tolven.ctom.CTOMRemote;
import org.tolven.ctom.entity.Subject;

/**
 * Test CTOM persistence in Tolven.
 * Perform a query bringing back no more than 100 subjects.
 * The query itself is done by the application server.
 * @author John Churin
 *
 */
public class Test2 {

	/**
	 * @param args
	 * @throws Exception 
	 */
	public static void main(String[] args) throws Exception {
		InitialContext ctx = new InitialContext();

		// Bind to the remote session bean interface in the running server via JNDI/RMI
		CTOMRemote ctom = (CTOMRemote) ctx.lookup("tolven/CTOMBean/remote");
		// Get the subjects
		List<Subject> subjects = ctom.findSubjects();
		// Iterate the list of subjects and display
		// Notice how compact this for loop is compared to previous versions of Java.
		// And no casts
		for (Subject subject : subjects ) {
			System.out.println( subject.getId() + " " + 
					subject.getFirstName() + " " + 
					subject.getLastName() + 
					" [" + subject.getAdministrativeGenderCode() + "] ");
		}
	}

}

--- NEW FILE: .project ---
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>ctomClient</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

[Tolven-cvs-commit] ctomClient - New directory

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

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

Log Message:
Directory /cvsroot/tolven/ctomClient added to the repository

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ctom/bean CTOMBean.java, NONE, 1.1

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

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

Added Files:
	CTOMBean.java 
Log Message:
NCI's Clinical Trials Object Model

--- NEW FILE: CTOMBean.java ---
package org.tolven.ctom.bean;

import java.text.SimpleDateFormat;
import java.util.List;

import javax.annotation.EJB;
import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;

import org.apache.commons.math.random.RandomData;
import org.tolven.ctom.CTOMLocal;
import org.tolven.ctom.CTOMRemote;
import org.tolven.ctom.entity.Study;
import org.tolven.ctom.entity.Subject;
import org.tolven.ctom.entity.SubjectAssignment;
import org.tolven.gen.PersonGenerator;
import org.tolven.gen.entity.VirtualPerson;

@Stateless()
@Local(CTOMLocal.class)
@Remote(CTOMRemote.class)
@WebService
public class CTOMBean implements org.tolven.ctom.CTOMLocal {

	@PersistenceContext
	private EntityManager em;

	@EJB
	private PersonGenerator personGen;
	
    private RandomData rng;
	private static SimpleDateFormat iso8601d = new SimpleDateFormat("yyyy-MM-dd"); 

	/**
	 * Persist a new study
	 * @param study
	 * @return the id of the new Study
	 */
	@WebMethod
	public long persist( Study study ) {
		em.persist(study);
		return study.getId();
	}

	/**
	 * Persist a new subject
	 * @param subject
	 * @return the id of the new Subject
	 */
	public long persist( Subject subject ) {
		em.persist(subject);
		return subject.getId();
	}

	/**
	 * Return a list of all subject known to the system (limited to 100)
	 * @return
	 */
	@WebMethod
	public List<Subject> findSubjects() {
		Query query = em.createQuery("SELECT s FROM Subject s");
		query.setMaxResults(100);
		return query.getResultList();
	}
	
	
}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ctom CTOMLocal.java, NONE, 1.1 CTOMRemote.java, NONE, 1.1

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

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

Added Files:
	CTOMLocal.java CTOMRemote.java 
Log Message:
NCI's Clinical Trials Object Model

--- NEW FILE: CTOMRemote.java ---
package org.tolven.ctom;

import java.util.List;

import javax.jws.WebMethod;

import org.tolven.ctom.entity.Study;
import org.tolven.ctom.entity.Subject;

public interface CTOMRemote {

	/**
	 * Persist a new study
	 * @param study
	 * @return the id of the new Study
	 */
	public long persist( Study study );

	/**
	 * Return a list of all subject known to the system (limited to 100)
	 * @return
	 */
	public List<Subject> findSubjects();

}

--- NEW FILE: CTOMLocal.java ---
package org.tolven.ctom;

import java.util.List;

import javax.jws.WebMethod;

import org.tolven.ctom.entity.Study;
import org.tolven.ctom.entity.Subject;

public interface CTOMLocal {


	/**
	 * Persist a new study
	 * @param study
	 * @return the id of the new Study
	 */
	public long persist( Study study );

	/**
	 * Persist a new subject
	 * @param subject
	 */
	public long persist( Subject subject );

	/**
	 * Return a list of all subject known to the system (limited to 100)
	 * @return
	 */
	public List<Subject> findSubjects();

}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ctom - New directory

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

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

Log Message:
Directory /cvsroot/tolven/tolvenEJB/src/org/tolven/ctom added to the repository

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ctom/bean - New directory

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

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

Log Message:
Directory /cvsroot/tolven/tolvenEJB/src/org/tolven/ctom/bean added to the repository

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ctom/entity - New directory

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

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

Log Message:
Directory /cvsroot/tolven/tolvenEJB/src/org/tolven/ctom/entity added to the repository

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen PersonGeneratorRemote.java, NONE, 1.1

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

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

Added Files:
	PersonGeneratorRemote.java 
Log Message:
Allow person generator to be called remote

--- NEW FILE: PersonGeneratorRemote.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.gen;

import java.util.Date;
import java.util.List;

import org.tolven.gen.entity.FamilyMember;
import org.tolven.gen.entity.FamilyUnit;
import org.tolven.gen.entity.VirtualPerson;

/**
 *
 * @author John Churin
 */
public interface PersonGeneratorRemote {
    /**
     * Create a simple person object with name, gender, and dob.
     * Do not persist the object.
     * 
     * @return a new VirtualPerson
     * @throws Exception
     */
    VirtualPerson generatePerson() throws Exception;

}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen/bean PersonGeneratorDAO.java, 1.7, 1.8

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

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

Modified Files:
	PersonGeneratorDAO.java 
Log Message:
Allow person generator to be called remote

Index: PersonGeneratorDAO.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/PersonGeneratorDAO.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PersonGeneratorDAO.java	18 Sep 2006 15:51:33 -0000	1.7
--- PersonGeneratorDAO.java	28 Sep 2006 19:13:28 -0000	1.8
***************
*** 22,25 ****
--- 22,26 ----
  import javax.annotation.Resource;
  import javax.ejb.Local;
+ import javax.ejb.Remote;
  import javax.ejb.SessionContext;
  import javax.ejb.Stateless;
***************
*** 32,35 ****
--- 33,37 ----
  import org.tolven.app.entity.MenuStructure;
  import org.tolven.gen.PersonGenerator;
+ import org.tolven.gen.PersonGeneratorRemote;
  import org.tolven.gen.entity.FamilyMember;
  import org.tolven.gen.entity.FamilyUnit;
***************
*** 47,50 ****
--- 49,53 ----
  @Stateless
  @Local(PersonGenerator.class)
+ @Remote(PersonGeneratorRemote.class)
  public class PersonGeneratorDAO implements PersonGenerator {
  

[Tolven-cvs-commit] tolvenWEB/web/five/test docList.xhtml, 1.1, 1.2 docDetail.xhtml, 1.1, 1.2

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

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

Modified Files:
	docList.xhtml docDetail.xhtml 
Log Message:
Preparation for Wizard input

Index: docDetail.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/docDetail.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docDetail.xhtml	18 Sep 2006 15:43:15 -0000	1.1
--- docDetail.xhtml	28 Sep 2006 19:12:08 -0000	1.2
***************
*** 11,28 ****
    	<ui:composition>
  		<div id="docDetailPane" >
!         <h:form id="docDetail" onsubmit="return ajaxSubmit2(this);">
! 			<h:panelGrid columns="2">
! 			     <h:outputText value="document Id"/>
! 			     <h:outputText id="id" value="#{doc.docXML.id}"/>
! 			</h:panelGrid>
  			<h:outputText value="Path"/>
! 			<h:inputText value="#{doc.path}" size="80" />
  			<h:outputText value="Value"/>
! 			<h:inputText value="#{doc.pathValue}" size="40"/>
! 			<h:commandButton id="docDetailSubmit" action="#{doc.evaluatePath}" value="Evaluate"/>
! 		</h:form>
!           
  <pre>
! #{doc.docXML.contentString}
  </pre>
         </div>
--- 11,47 ----
    	<ui:composition>
  		<div id="docDetailPane" >
! <h:dataTable value="#{ccr.ccrPaths}" var="p">
! 	<h:column>
! 		<f:facet name="header">
  			<h:outputText value="Path"/>
! 		</f:facet>
! 		<h:outputText value="#{p.label}"/>
! 	</h:column>
! 	<h:column>
! 		<f:facet name="header">
  			<h:outputText value="Value"/>
! 		</f:facet>
! 		<h:outputText value="#{p.value}"/>
! 	</h:column>
! </h:dataTable>
! <h:form id="docDetail" onsubmit="return ajaxSubmit2(this);">
! 	<h:panelGrid columns="2">
! 	     <h:outputText value="document Id"/>
! 	     <h:outputText id="id" value="#{ccr.documentId}"/>
! 	</h:panelGrid>
! 	<h:outputText value="Path"/>
! 	<h:inputText value="#{ccr.path}" size="80" />
! 	<h:outputText value="Value"/>
! 	<h:inputText value="#{ccr.pathValue}" size="40"/>
! 	<h:commandButton id="docDetailSubmit" action="#{ccr.evaluatePath}" value="Evaluate"/>
! </h:form>
! <h:form id="docDetail2" onsubmit="return ajaxSubmit2(this);">
! 	<h:commandButton action="#{ccr.newCCR}" value="New CCR"/>
! </h:form>
! <h:form id="docDetail3" onsubmit="return ajaxSubmit2(this);">
! 	<h:commandButton action="#{ccr.addPatient}" value="Add Patient"/>
! </h:form>
  <pre>
! #{ccr.docXML.contentString}
  </pre>
         </div>

Index: docList.xhtml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/docList.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** docList.xhtml	18 Sep 2006 15:43:15 -0000	1.1
--- docList.xhtml	28 Sep 2006 19:12:08 -0000	1.2
***************
*** 48,51 ****
--- 48,58 ----
  	</table>
  </div>
+ <div id="docListPane">
+ 	<h:form id="docListForm" onsubmit="return ajaxSubmit2(this);">
+ 	  <h:commandLink action="#{ccr.newCCR}" immediate="true" >
+ 		<h:outputText value="New CCR"/>
+ 	  </h:commandLink>
+ 	</h:form>
+ </div>
  		</ui:composition>
  	</body>

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web/ccr CCRAction.java, NONE, 1.1

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

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

Added Files:
	CCRAction.java 
Log Message:
Preparation for Wizard input

--- NEW FILE: CCRAction.java ---
package org.tolven.web.ccr;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

import javax.el.ELException;
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
import javax.naming.NamingException;
import javax.xml.bind.JAXBException;

import org.tolven.ccr.ActorType;
import org.tolven.ccr.ContinuityOfCareRecord;
import org.tolven.ccr.PersonNameType;
import org.tolven.ccr.ContinuityOfCareRecord.Patient;
import org.tolven.doc.entity.CCRException;
import org.tolven.doc.entity.DocBase;
import org.tolven.doc.entity.DocCCR;
import org.tolven.web.DocAction;


public class CCRAction extends DocAction {

	private ActorType actor;
	private List<SelectItem> ccrPathItems = null;

	private boolean debug;

	public CCRAction() throws NamingException {
		super();
	}
	
	protected void addCCRPath( String path ){
		FacesContext ctx = FacesContext.getCurrentInstance();
		Application app = ctx.getApplication();
		String pathValue;
		try {
			pathValue = (String) app.evaluateExpressionGet(ctx, path, String.class );
		} catch (ELException e) {
			pathValue = e.getMessage();
		}
		ccrPathItems.add( new SelectItem(pathValue, path ));
	}

	/**
     * A shortcut to return a list of the actors playing patients.
     * These actors may be playing other roles as well.
     * There is usually only one patient, sometimes two (conjoined twins)
     * @return A list of ActorTypes corresponding to the list of Patients in this document
	 * @throws Exception 
	 * @throws JAXBException 
     */
    public List<ActorType> getPatientActor( ) throws JAXBException, Exception {
    	int patCount = getCCR().getPatient().size();
    	List<ActorType> patientActors = new ArrayList<ActorType>(patCount);
    	for(Patient p : getCCR().getPatient()) {
	    	for ( ActorType a : getCCR().getActors().getActor()) {
	    		if (a.getActorObjectID().equals(p.getActorID())) {
	    			patientActors.add(a);
	    		}
	    	}
    	}
    	return patientActors;
    }
    
	public List<SelectItem> getccrPaths() throws JAXBException, Exception {
		if (ccrPathItems==null) {
			ccrPathItems = new ArrayList<SelectItem>( 30 );
			ContinuityOfCareRecord ccr = getCCR();
			if (ccr==null) return ccrPathItems; 
			addCCRPath( "#{ccr.CCR.CCRDocumentObjectID}" );
			addCCRPath( "#{ccr.CCR.version}" );
			addCCRPath( "#{ccr.CCR.patient[0].actorID}" );
			addCCRPath( "#{ccr.CCR.patient[1].actorID}" );
			addCCRPath( "#{ccr.patientActor[0].person.name.currentName.given[0]}" );
			addCCRPath( "#{ccr.CCR.actors.actor[0].person.name.currentName.family[0]}" );
			addCCRPath( "#{ccr.patientActor[0].person.dateOfBirth}" );
			addCCRPath( "#{ccr.CCR.actors.actor[0].person.gender.text}" );
			addCCRPath( "#{ccr.patientActor[0].address[0].line1}" );
			addCCRPath( "#{ccr.CCR.actors.actor[0].address[0].line2}" );
			addCCRPath( "#{ccr.patientActor[0].address[0].city}" );
			addCCRPath( "#{ccr.CCR.actors.actor[0].address[0].state}" );
			addCCRPath( "#{ccr.patientActor[0].address[0].postalCode}" );
			addCCRPath( "#{ccr.CCR.actors.actor[0].address[0].country}" );
			addCCRPath( "#{ccr.patientActor[0].address[0].county}" );
		}
		return ccrPathItems;
	}

	/**
	 * Create a new instance of a CCR document.
	 * @return
	 * @throws CCRException 
	 * @throws IOException 
	 * @throws JAXBException 
	 */
	public String newCCR() throws IOException, CCRException, JAXBException {
		System.out.println( "Create new document...");
		// Create a new CCR document.
		DocCCR docCCR = docBean.createCCRDocument(getTop().getUser().getId(), getTop().getAccountId());
		setDoc( docCCR );
		System.out.println( "...created id " + getDoc().getId());
		docBean.persistCCRDocument(docCCR, false);
		return "success";
	}

	public String addPatient( ) throws Exception {
		getDocCCR().addNewPatient();
		System.out.println( "Patient added to " + getDocCCR().getId());
		docBean.persistCCRDocument(getDocCCR(), false);
		return "success";
	}
	
	/**
	 * Return the unmarshalled (or new) CCR object graph for this document. 
	 * @return root of ContinuityOfCareRecord
	 * @throws JAXBException
	 * @throws Exception
	 */
	public ContinuityOfCareRecord getCCR() throws JAXBException, Exception {
		if (getDocXML()==null) return null;
		if (!(getDocXML() instanceof DocCCR)) return null;
		DocCCR ccr = (DocCCR) getDocXML();
		return (ContinuityOfCareRecord) ccr.getCCR();
	}

	/**
	 * Type-safe accessor for document that is a CCR.
	 * @return
	 */
	public DocCCR getDocCCR() {
		DocBase doc = getDoc();
		if (doc==null) return null;
		if (doc instanceof DocCCR) return (DocCCR) doc;
		return null;
	}

	/**
	 * @return
	 */
	public ActorType getActor() {
		if (actor==null) {
			actor = new ActorType();
			ActorType.Person person = new ActorType.Person(); 
			PersonNameType personName = new PersonNameType();
			personName.getGiven().add("a given name 3");
			ActorType.Person.Name name = new ActorType.Person.Name();
			name.setCurrentName(personName);
			person.setName(name);
			actor.setPerson(person);
		}
		return actor;
	}

	public void setActor(ActorType actor) {
		this.actor = actor;
	}
	
	public String submit() throws JAXBException, IOException, CCRException {
		System.out.println( "CCR Submit "  );
//		docBean.persistCCRDocument(getDocCCR(), true);
		ActorType actor = getActor();
		if (actor==null) return "success";
		ActorType.Person person = actor.getPerson();
		if (person==null) return "success";
		ActorType.Person.Name name = person.getName();
		if (name==null) return "success";
		PersonNameType pnt = name.getCurrentName();
		if (pnt==null) return "success";
		System.out.println( "PersonNameType: " + pnt.getFamily() + "," + pnt.getGiven() );
		return "success";
	}

	public String reset() {
		System.out.println( "CCR Reset "  );
		actor = null;
		return "success";
	}

	public String add() {
		Object type = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("type");
		Object parent = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("parent");
		System.out.println( "Add a " + type + " to " + parent  );
//		if (parent instanceof ActorType.Person.Name) {
			ActorType.Person.Name lp = (ActorType.Person.Name)parent;
			lp.setBirthName(new PersonNameType ());
			System.out.println( "Added birth Name");
//		}
		return "success";
	}

	public boolean isDebug() {
		return debug;
	}

	public void setDebug(boolean debug) {
		this.debug = debug;
	}
}

[Tolven-cvs-commit] tolvenWEB/src/org/tolven/web DocAction.java, 1.7, 1.8

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

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

Modified Files:
	DocAction.java 
Log Message:
Preparation for Wizard input

Index: DocAction.java
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/DocAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DocAction.java	18 Sep 2006 15:43:15 -0000	1.7
--- DocAction.java	28 Sep 2006 19:12:08 -0000	1.8
***************
*** 14,22 ****
--- 14,25 ----
  
  package org.tolven.web;
+ import java.util.ArrayList;
  import java.util.List;
  import java.util.Map;
  
+ import javax.el.ELException;
  import javax.faces.application.Application;
  import javax.faces.context.FacesContext;
+ import javax.faces.model.SelectItem;
  import javax.naming.InitialContext;
  import javax.naming.NamingException;
***************
*** 40,43 ****
--- 43,47 ----
  	private String path;
  	private String pathValue;
+ 	private DocBase doc = null; 
  	
      private String elapsedTime = null;
***************
*** 47,51 ****
      
  //  @EJB 
!     private DocumentLocal docBean;
  
      /** Creates a new instance of DocAction 
--- 51,55 ----
      
  //  @EJB 
!     protected DocumentLocal docBean;
  
      /** Creates a new instance of DocAction 
***************
*** 64,68 ****
       */
      public String create() {
!     	DocBase doc = new DocBase();
      	doc.setMediaType( "text/plain" );
      	doc.setContentString( content );
--- 68,72 ----
       */
      public String create() {
!     	doc = new DocBase();
      	doc.setMediaType( "text/plain" );
      	doc.setContentString( content );
***************
*** 70,102 ****
      	return "success";
      }
!     
! 	public DocXML getDocXML( ) throws Exception {
! 		DocBase doc = docBean.findDocument(getCurrentDocId());
! 		System.out.println( "[getDocXML] id=" + getCurrentDocId());
  		if (doc==null) {
! 			System.out.println( "No Document Found");
! 			return null;
! 		}
! 		// Has to be for this account or it's not found.
! 		if (this.getTop().getAccountId()!=doc.getAccount().getId()) {
! 			System.out.println( "Document owned by this account");
! 			return null;
! 		}
! 		if (!(doc instanceof DocXML)) {
! 			System.out.println( "Document is not CCR " + doc.getId() + " Class: " + doc.getClass().getName());
! 			return null;
  		}
! 		return (DocXML) doc;
  	}
  
! 	public ContinuityOfCareRecord getccr() throws JAXBException, Exception {
! 		if (getDocXML()==null) return null;
! 		if (!(getDocXML() instanceof DocCCR)) return null;
! 		DocCCR ccr = (DocCCR) getDocXML();
! 		return (ContinuityOfCareRecord) ccr.getBinding();
  	}
  
! 	public long getCurrentDocId( ) {
      	if (documentId==00) {
  	    	Map<String,Object> reqMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
  	    	MenuAction menuAction = (MenuAction) reqMap.get( "menu");
--- 74,126 ----
      	return "success";
      }
! 
!     /**
!      * Set the current document. This requires the document to exist.
!      * @param doc
!      */
!     public void setDoc( DocBase doc ) {
!     	this.doc = doc;
!     	documentId = doc.getId();
!     }
! 
!     /**
!      * Get the current document, if any
!      * @return
!      */
!     public DocBase getDoc() {
  		if (doc==null) {
! 			doc = docBean.findDocument(getDocumentId());
! 			System.out.println( "[getDocXML] id=" + getDocumentId());
! 			if (doc==null) {
! 				System.out.println( "No Document Found");
! 				return null;
! 			}
! 			// Has to be for this account or it's not found.
! 			if (this.getTop().getAccountId()!=doc.getAccount().getId()) {
! 				System.out.println( "Document not owned by this account");
! 				return null;
! 			}
  		}
! 		return doc;
  	}
  
! 	/**
! 	 * Type-safe method to return the current XML-based document, if any.
! 	 * @return
! 	 * @throws Exception
! 	 */
!     public DocXML getDocXML( ) throws Exception {
!     	DocBase d = getDoc();
!     	if (d==null) return null;
!     	if (!(d instanceof DocXML)) {
! 			System.out.println( "Document is not CCR " + d.getId() + " Class: " + d.getClass().getName());
! 			return null;
! 		}
! 		return (DocXML) d;
  	}
  
! 	public long getDocumentId() {
      	if (documentId==00) {
+     		System.out.println( "Get documentId from request: ");
  	    	Map<String,Object> reqMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
  	    	MenuAction menuAction = (MenuAction) reqMap.get( "menu");
***************
*** 106,110 ****
      	}
      	return documentId;
!     }
  
      /**
--- 130,138 ----
      	}
      	return documentId;
! 	}
! 
! 	public void setDocumentId(long documentId) {
! 		this.documentId = documentId;
! 	}
  
      /**
***************
*** 113,117 ****
      public DocImage getPhoto() {
      	// Get the familt we're looking for
!     	long id = getCurrentDocId();
      	return docBean.findImage( id, getTop().getAccountId() );
      }
--- 141,145 ----
      public DocImage getPhoto() {
      	// Get the familt we're looking for
!     	long id = getDocumentId();
      	return docBean.findImage( id, getTop().getAccountId() );
      }
***************
*** 121,125 ****
          return rslt;
      }
! 	/**
  	 * Return a count of the number of photos owned/authored by the current user
  	 * @return
--- 149,154 ----
          return rslt;
      }
! 
!     /**
  	 * Return a count of the number of photos owned/authored by the current user
  	 * @return
***************
*** 190,196 ****
  
  	public String getPath() {
! 		if (path==null) {
! 			path = "#{doc.ccr.actors.actor[0].address[0].line1}";
! 		}
  		return path;
  	}
--- 219,225 ----
  
  	public String getPath() {
! //		if (path==null) {
! //			path = "#{doc.ccr.actors.actor[0].address[0].line1}";
! //		}
  		return path;
  	}
***************
*** 208,211 ****
  	}
  
- 
  }
--- 237,239 ----

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

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

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

Modified Files:
	faces-config.xml 
Log Message:
Preparation for Wizard input

Index: faces-config.xml
===================================================================
RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** faces-config.xml	18 Sep 2006 16:06:23 -0000	1.16
--- faces-config.xml	28 Sep 2006 19:12:08 -0000	1.17
***************
*** 457,463 ****
          </navigation-case>
          <navigation-case>
!             <from-action>#{doc.evaluatePath}</from-action>
              <from-outcome>success</from-outcome>
!             <to-view-id>/five//test/docDetail.xhtml</to-view-id>
          </navigation-case>
      </navigation-rule>
--- 457,492 ----
          </navigation-case>
          <navigation-case>
!             <from-action>#{ccr.evaluatePath}</from-action>
              <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docDetail.xhtml</to-view-id>
!         </navigation-case>
!         <navigation-case>
!             <from-action>#{ccr.newCCR}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docList.xhtml</to-view-id>
!         </navigation-case>
!         <navigation-case>
!             <from-action>#{ccr.addPatient}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docDetail.xhtml</to-view-id>
!         </navigation-case>
!     </navigation-rule>
! 
!     <navigation-rule>
!         <from-view-id>/five/test/docDetail.xhtml</from-view-id>
!         <navigation-case>
!             <from-action>#{ccr.evaluatePath}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docDetail.xhtml</to-view-id>
!         </navigation-case>
!         <navigation-case>
!             <from-action>#{ccr.newCCR}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docDetail.xhtml</to-view-id>
!         </navigation-case>
!         <navigation-case>
!             <from-action>#{ccr.addPatient}</from-action>
!             <from-outcome>success</from-outcome>
!             <to-view-id>/five/test/docDetail.xhtml</to-view-id>
          </navigation-case>
      </navigation-rule>
***************
*** 493,496 ****
--- 522,537 ----
      <navigation-rule>
          <description>
+             Document List
+         </description>
+         <from-view-id>/five/test/docList.xhtml</from-view-id>
+         <navigation-case>
+             <from-action>#{ccr.newCCR}</from-action>
+             <from-outcome>success</from-outcome>
+             <to-view-id>/five/test/docList.xhtml</to-view-id>
+         </navigation-case>
+     </navigation-rule>
+ 
+     <navigation-rule>
+         <description>
              CCR Test
          </description>
***************
*** 520,527 ****
      <managed-bean>
          <description>
!         TEMPORARY FOR TESTING CCR
          </description>
          <managed-bean-name>ccr</managed-bean-name>
!         <managed-bean-class>org.tolven.web.CCRAction</managed-bean-class>
          <managed-bean-scope>request</managed-bean-scope>
      </managed-bean>
--- 561,568 ----
      <managed-bean>
          <description>
!         ASTM CCR Actions
          </description>
          <managed-bean-name>ccr</managed-bean-name>
!         <managed-bean-class>org.tolven.web.ccr.CCRAction</managed-bean-class>
          <managed-bean-scope>request</managed-bean-scope>
      </managed-bean>

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/gen/bean CHRGeneratorBean.java, 1.7, 1.8

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

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

Modified Files:
	CHRGeneratorBean.java 
Log Message:
Make validation optional, such as when user has not yet submitted (signed) a document.

Index: CHRGeneratorBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CHRGeneratorBean.java	18 Sep 2006 15:52:13 -0000	1.7
--- CHRGeneratorBean.java	28 Sep 2006 19:07:39 -0000	1.8
***************
*** 257,261 ****
  			person.setGender(genderCode);
  		}
! 		documentLocal.persistCCRDocument(ccr);
  		
      	// The generic, free-floating patient menu structure
--- 257,261 ----
  			person.setGender(genderCode);
  		}
! 		documentLocal.persistCCRDocument(ccr, true);
  		
      	// The generic, free-floating patient menu structure

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/bean DocumentBean.java, 1.7, 1.8

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

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

Modified Files:
	DocumentBean.java 
Log Message:
Early Wizard changes

Index: DocumentBean.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DocumentBean.java	18 Sep 2006 15:41:42 -0000	1.7
--- DocumentBean.java	28 Sep 2006 19:06:01 -0000	1.8
***************
*** 112,117 ****
  	 * @throws JAXBException 
  	 */
! 	public void persistCCRDocument( DocCCR doc ) throws JAXBException, IOException, CCRException {
! 		doc.validateAndMarshallXML();
  		em.merge(doc);
  	}
--- 112,117 ----
  	 * @throws JAXBException 
  	 */
! 	public void persistCCRDocument( DocCCR doc, boolean validate ) throws JAXBException, IOException, CCRException {
! 		doc.marshallXML(validate);
  		em.merge(doc);
  	}

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/ccr ContinuityOfCareRecord.java, 1.2, 1.3

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

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

Modified Files:
	ContinuityOfCareRecord.java 
Log Message:
Early Wizard changes

Index: ContinuityOfCareRecord.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/ccr/ContinuityOfCareRecord.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ContinuityOfCareRecord.java	21 Jun 2006 02:29:54 -0000	1.2
--- ContinuityOfCareRecord.java	28 Sep 2006 19:06:01 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  import java.util.ArrayList;
  import java.util.List;
+ 
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
***************
*** 16,44 ****
  import javax.xml.bind.annotation.XmlRootElement;
  import javax.xml.bind.annotation.XmlType;
- import org.tolven.ccr.ContinuityOfCareRecord.Actors;
- import org.tolven.ccr.ContinuityOfCareRecord.Body;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.AdvanceDirectives;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Alerts;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Encounters;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.FamilyHistory;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.FunctionalStatus;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.HealthCareProviders;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Immunizations;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.MedicalEquipment;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Medications;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Payers;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.PlanOfCare;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Problems;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Procedures;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Results;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.SocialHistory;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.Support;
- import org.tolven.ccr.ContinuityOfCareRecord.Body.VitalSigns;
- import org.tolven.ccr.ContinuityOfCareRecord.Comments;
- import org.tolven.ccr.ContinuityOfCareRecord.From;
- import org.tolven.ccr.ContinuityOfCareRecord.Patient;
- import org.tolven.ccr.ContinuityOfCareRecord.References;
- import org.tolven.ccr.ContinuityOfCareRecord.Signatures;
- import org.tolven.ccr.ContinuityOfCareRecord.To;
  
  
--- 17,20 ----

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc/entity DocXML.java, 1.1, 1.2 DocBase.java, 1.6, 1.7 DocCCR.java, 1.1, 1.2

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

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

Modified Files:
	DocXML.java DocBase.java DocCCR.java 
Log Message:
Early Wizard changes

Index: DocBase.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DocBase.java	31 Aug 2006 05:18:28 -0000	1.6
--- DocBase.java	28 Sep 2006 19:06:01 -0000	1.7
***************
*** 149,152 ****
--- 149,153 ----
  
      public String getContentString() {
+     	if (getContent()==null) return null;
          return new String(content);
      }

Index: DocXML.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocXML.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocXML.java	28 Aug 2006 19:37:36 -0000	1.1
--- DocXML.java	28 Sep 2006 19:06:01 -0000	1.2
***************
*** 108,112 ****
  	 */
  	public Object getBinding() throws JAXBException {
! 		if (binding==null) {
  	        JAXBContext jc = setupJAXBContext();
  	        Unmarshaller u = jc.createUnmarshaller();
--- 108,112 ----
  	 */
  	public Object getBinding() throws JAXBException {
! 		if (binding==null && getContentString()!=null) {
  	        JAXBContext jc = setupJAXBContext();
  	        Unmarshaller u = jc.createUnmarshaller();

Index: DocCCR.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocCCR.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DocCCR.java	28 Aug 2006 19:37:36 -0000	1.1
--- DocCCR.java	28 Sep 2006 19:06:01 -0000	1.2
***************
*** 112,116 ****
  	 */
  	public ContinuityOfCareRecord getCCR() throws JAXBException {
! 		if (newCCR!=null) return newCCR;
  		return (ContinuityOfCareRecord)getBinding();
  	}
--- 112,120 ----
  	 */
  	public ContinuityOfCareRecord getCCR() throws JAXBException {
! 		if (newCCR!=null) {
! 			System.out.println( "Returning the newCCR root: " + getId());
! 			return newCCR;
! 		}
! 		System.out.println( "Returning CCR Binding root: " + getId());
  		return (ContinuityOfCareRecord)getBinding();
  	}
***************
*** 124,134 ****
  	 * @throws CCRException 
  	 */
! 	public void validateAndMarshallXML() throws JAXBException, IOException, CCRException {
! 		if (newCCR==null) return;
  		// Reset the actors list with the actors we now have in the transient map
  		ContinuityOfCareRecord.Actors actors = new ContinuityOfCareRecord.Actors();
  		actors.getActor().addAll(getActors().values());
  		newCCR.setActors(actors);
! 		if (newCCR.getPatient().size()==0) throw new CCRException("Patient required A2.5.2.6(1)" );
  		// We're done with the graph, marshall to XML
  		setBinding( newCCR );
--- 128,142 ----
  	 * @throws CCRException 
  	 */
! 	public void marshallXML(boolean validate) throws JAXBException, IOException, CCRException {
! 		if (newCCR==null && getBinding()==null) return;
! 		if (newCCR==null ) newCCR = (ContinuityOfCareRecord)getBinding();
  		// Reset the actors list with the actors we now have in the transient map
  		ContinuityOfCareRecord.Actors actors = new ContinuityOfCareRecord.Actors();
  		actors.getActor().addAll(getActors().values());
  		newCCR.setActors(actors);
! 		if (validate) {
! 			if (newCCR.getPatient().size()>2) throw new CCRException( "No more than two patients allowed A2.5.2.6(3) ");
! 			if (newCCR.getPatient().size()==0) throw new CCRException("Patient required A2.5.2.6(1)" );
! 		}
  		// We're done with the graph, marshall to XML
  		setBinding( newCCR );
***************
*** 196,199 ****
--- 204,208 ----
  		// when we put it in the CCR document.
  		getActors().put(actor.getActorObjectID(), actor);
+ 		System.out.println( "Adding Actor: " + actor.getActorObjectID());
  		return actor;
  	}
***************
*** 216,220 ****
  	/**
  	 * The actor already exists, we're just adding this actor as the patient.
! 	 * Only do this once or you're violating CCR semantics (except for Siamese twins)
  	 * @param actor
  	 * @return
--- 225,230 ----
  	/**
  	 * The actor already exists, we're just adding this actor as the patient.
! 	 * Only do this once or you're violating CCR semantics (except for Siamese twins).
! 	 * We won't complain now, but it could fail during validation.
  	 * @param actor
  	 * @return
***************
*** 224,228 ****
  	public void addPatient( ActorType actor ) throws CCRException, JAXBException {
  		checkEditable();
- 		if (getCCR().getPatient().size()==2) throw new CCRException( "No more than two patients allowed A2.5.2.6(3) ");
  		ContinuityOfCareRecord.Patient pat = new ContinuityOfCareRecord.Patient();
  		pat.setActorID(actor.getActorObjectID());
--- 234,237 ----

[Tolven-cvs-commit] tolvenEJB/src/org/tolven/doc DocumentLocal.java, 1.6, 1.7

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

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

Modified Files:
	DocumentLocal.java 
Log Message:
Early Wizard changes

Index: DocumentLocal.java
===================================================================
RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/DocumentLocal.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DocumentLocal.java	18 Sep 2006 15:50:29 -0000	1.6
--- DocumentLocal.java	28 Sep 2006 19:06:01 -0000	1.7
***************
*** 67,71 ****
  	 * @param doc
  	 */
! 	public void persistCCRDocument( DocCCR doc ) throws JAXBException, IOException, CCRException;	
  	/**
  	 * Not a very practical method but we'll use it for testing.
--- 67,71 ----
  	 * @param doc
  	 */
! 	public void persistCCRDocument( DocCCR doc, boolean validate ) throws JAXBException, IOException, CCRException;
  	/**
  	 * Not a very practical method but we'll use it for testing.