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: Joseph I. <jos...@us...> - 2007-03-10 20:50:32
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6713/src/org/tolven/security/bean Modified Files: Tag: P_JI_RefreshAPK LoginBean.java Log Message: BRANCH: added findAccountUser to avoid @SecurityDomain of ActivationBean Index: LoginBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LoginBean.java,v retrieving revision 1.6 retrieving revision 1.6.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** LoginBean.java 28 Feb 2007 03:45:11 -0000 1.6 --- LoginBean.java 10 Mar 2007 20:50:30 -0000 1.6.6.1 *************** *** 74,77 **** --- 74,81 ---- } + private AccountUser findAccountUser(long accountUserId) { + return em.find(AccountUser.class, accountUserId); + } + /** * Return an AccountPrivateKey given an AccountUserId *************** *** 80,84 **** */ public AccountPrivateKey findAccountPrivateKey(long anAccountUserId) { ! AccountUser accountUser = activationBean.findAccountUser(anAccountUserId); if (accountUser == null) throw new RuntimeException("Could not find AccountUser with id=" + anAccountUserId); --- 84,88 ---- */ public AccountPrivateKey findAccountPrivateKey(long anAccountUserId) { ! AccountUser accountUser = findAccountUser(anAccountUserId); if (accountUser == null) throw new RuntimeException("Could not find AccountUser with id=" + anAccountUserId); *************** *** 92,96 **** */ public AccountPublicKey findAccountPublicKey(long anAccountUserId) { ! AccountUser accountUser = activationBean.findAccountUser(anAccountUserId); if (accountUser == null) throw new RuntimeException("Could not find AccountUser with id=" + anAccountUserId); --- 96,100 ---- */ public AccountPublicKey findAccountPublicKey(long anAccountUserId) { ! AccountUser accountUser = findAccountUser(anAccountUserId); if (accountUser == null) throw new RuntimeException("Could not find AccountUser with id=" + anAccountUserId); |
|
From: John C. <jc...@us...> - 2007-03-10 17:22:49
|
Update of /cvsroot/tolven/tolvenSecurity/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10937/bin Log Message: Directory /cvsroot/tolven/tolvenSecurity/bin added to the repository |
|
From: John C. <jc...@us...> - 2007-03-10 17:22:49
|
Update of /cvsroot/tolven/tolvenSecurity/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10937/src Log Message: Directory /cvsroot/tolven/tolvenSecurity/src added to the repository |
|
From: John C. <jc...@us...> - 2007-03-10 17:21:36
|
Update of /cvsroot/tolven/tolvenSecurity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10463/tolvenSecurity Log Message: Directory /cvsroot/tolven/tolvenSecurity added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-03-10 10:00:44
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10154/installer/izpack-8.1 Modified Files: Tag: P_JI_RefreshAPK tolven-install.xml Log Message: BRANCH: Introduce tolvenSecurity's UsernamePasswordAccountUserIdCallbackHandler to obtain the AccountUserId from a HttpServletRequest. Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.16 retrieving revision 1.16.4.1 diff -C2 -d -r1.16 -r1.16.4.1 *** tolven-install.xml 24 Feb 2007 23:59:09 -0000 1.16 --- tolven-install.xml 10 Mar 2007 10:00:39 -0000 1.16.4.1 *************** *** 215,218 **** --- 215,221 ---- includes="tolvenBrowse/**" excludes="tolvenBrowse/bin/**,tolvenBrowse/build/**" /> + <fileset dir="../../.." targetdir="$INSTALL_PATH" + includes="tolvenSecurity/**" + excludes="tolvenSecurity/bin/**,tolvenSecurity/build/**" /> <depends packname="base" /> </pack> |
|
From: Joseph I. <jos...@us...> - 2007-03-10 10:00:41
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10154 Modified Files: Tag: P_JI_RefreshAPK build.xml Log Message: BRANCH: Introduce tolvenSecurity's UsernamePasswordAccountUserIdCallbackHandler to obtain the AccountUserId from a HttpServletRequest. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.76 retrieving revision 1.76.2.1 diff -C2 -d -r1.76 -r1.76.2.1 *** build.xml 5 Mar 2007 05:57:44 -0000 1.76 --- build.xml 10 Mar 2007 10:00:38 -0000 1.76.2.1 *************** *** 33,36 **** --- 33,37 ---- </delete> <delete dir="${tolven.home}/tolven-jboss-4.0.4.GA/docs" /> + <copy file="${tolven.home}/tolven/jboss-config/security-service.xml" todir="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy" overwrite="true" preservelastmodified="true" /> <copy file="${tolven.home}/tolven/jboss-config/ejb-timer-service.xml" todir="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" /> <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/conf" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> *************** *** 189,192 **** --- 190,194 ---- <fileset file="build/tolven.ear"/> </copy> + <copy toDir="${deploy.location}/lib" file="${tolvenSecurity.location}/build/tolvenSecurity.jar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" /> </target> <target name="packaging" depends="dependencies" description="tolven.ear"> *************** *** 221,224 **** --- 223,227 ---- <target depends="init" name="dependencies" description="Build dependent projects"> + <ant dir="${tolvenSecurity.location}" antfile="${tolvenSecurity.location}/build.xml" target="packaging"/> <ant dir="${tolvenEJB.location}" antfile="${tolvenEJB.location}/build.xml" target="packaging" /> <ant dir="${tolvenWEB.location}" antfile="${tolvenWEB.location}/build.xml" target="packaging" /> |
|
From: Joseph I. <jos...@us...> - 2007-03-10 10:00:41
|
Update of /cvsroot/tolven/tolven/installer/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10154/installer/template Modified Files: Tag: P_JI_RefreshAPK ant-build.template Log Message: BRANCH: Introduce tolvenSecurity's UsernamePasswordAccountUserIdCallbackHandler to obtain the AccountUserId from a HttpServletRequest. Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/installer/template/ant-build.template,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** ant-build.template 24 Feb 2007 23:59:09 -0000 1.5 --- ant-build.template 10 Mar 2007 10:00:39 -0000 1.5.4.1 *************** *** 78,81 **** --- 78,82 ---- tolvenBrowse.location=${tolven.home}/tolvenBrowse tolvenMobileServer.location=${tolven.home}/tolvenMobileServer + tolvenSecurity.location=${tolven.home}/tolvenSecurity jboss-rules.location=${tolven.location}/lib/jboss-rules |
|
From: Joseph I. <jos...@us...> - 2007-03-10 10:00:41
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10154/jboss-config Added Files: Tag: P_JI_RefreshAPK security-service.xml Log Message: BRANCH: Introduce tolvenSecurity's UsernamePasswordAccountUserIdCallbackHandler to obtain the AccountUserId from a HttpServletRequest. --- NEW FILE: security-service.xml --- <server> <!-- ==================================================================== --> <!-- Security --> <!-- ==================================================================== --> <mbean code="org.jboss.security.plugins.SecurityConfig" name="jboss.security:service=SecurityConfig"> <attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute> </mbean> <mbean code="org.jboss.security.auth.login.XMLLoginConfig" name="jboss.security:service=XMLLoginConfig"> <attribute name="ConfigResource">login-config.xml</attribute> </mbean> <!-- JAAS security manager and realm mapping --> <mbean code="org.jboss.security.plugins.JaasSecurityManagerService" name="jboss.security:service=JaasSecurityManager"> <attribute name="SecurityManagerClassName">org.jboss.security.plugins.JaasSecurityManager</attribute> <attribute name="DefaultUnauthenticatedPrincipal">anonymous</attribute> <!-- DefaultCacheTimeout: Specifies the default timed cache policy timeout in seconds. If you want to disable caching of security credentials, set this to 0 to force authentication to occur every time. This has no affect if the AuthenticationCacheJndiName has been changed from the default value. --> <attribute name="DefaultCacheTimeout">1800</attribute> <!-- DefaultCacheResolution: Specifies the default timed cache policy resolution in seconds. This controls the interval at which the cache current timestamp is updated and should be less than the DefaultCacheTimeout in order for the timeout to be meaningful. This has no affect if the AuthenticationCacheJndiName has been changed from the default value. --> <attribute name="DefaultCacheResolution">60</attribute> <attribute name="CallbackHandlerClassName">org.tolven.web.security.auth.UsernamePasswordAccountUserIdCallbackHandler</attribute> </mbean> </server> |
|
From: Joseph I. <jos...@us...> - 2007-03-10 06:03:48
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10615/web/WEB-INF Modified Files: web.xml Log Message: Shortened the session timeout to 30 mins. Index: web.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/web.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** web.xml 8 Mar 2007 17:03:43 -0000 1.25 --- web.xml 10 Mar 2007 06:03:47 -0000 1.26 *************** *** 196,202 **** </servlet-mapping> ! <session-config><session-timeout> ! 300 ! </session-timeout> </session-config> <welcome-file-list> --- 196,201 ---- </servlet-mapping> ! <session-config> ! <session-timeout>30</session-timeout> </session-config> <welcome-file-list> |
|
From: John C. <jc...@us...> - 2007-03-10 04:21:07
|
Update of /cvsroot/tolven/tolven/postgres-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1918/postgres-config Modified Files: indexes.sql Log Message: Add two new indexes for data entry support. Index: indexes.sql =================================================================== RCS file: /cvsroot/tolven/tolven/postgres-config/indexes.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** indexes.sql 16 Jan 2007 06:10:32 -0000 1.2 --- indexes.sql 10 Mar 2007 04:21:00 -0000 1.3 *************** *** 2,5 **** --- 2,8 ---- DROP INDEX app.md_index2; DROP INDEX app.md_index3; + DROP INDEX app.md_index4; + DROP INDEX app.md_index5; + DROP INDEX app.ms_index1; DROP INDEX app.mcol_index1; *************** *** 23,26 **** --- 26,39 ---- (menustructure_id, lower(string01::text)); + CREATE INDEX md_index4 + ON app.menu_data + USING btree + (account_id, document_id); + + CREATE INDEX md_index5 + ON app.menu_data + USING btree + (account_id, menu_path); + CREATE INDEX ms_index1 ON app.menu_structure |
|
From: John C. <jc...@us...> - 2007-03-10 04:19:58
|
Update of /cvsroot/tolven/tolvenMobileClient In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1451 Modified Files: build.xml Log Message: Add missing Midlet component (jar ile name) Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolvenMobileClient/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 1 Mar 2007 22:28:04 -0000 1.2 --- build.xml 10 Mar 2007 04:19:57 -0000 1.3 *************** *** 14,17 **** --- 14,18 ---- <property name="MIDletDescription" value="Tolven Applications"/> <property name="MIDletIcon" value="/img/ePHR.png"/> + <property name="MIDletJarURL" value="tolven.jar"/> <property name="MIDletName" value="tolven"/> <property name="MIDletPermissions" value="javax.microedition.io.Connector.http,javax.microedition.io.Connector.https"/> *************** *** 95,98 **** --- 96,100 ---- <filter token="MIDletName" value="${MIDletName}"/> <filter token="MIDletJarSize" value="${MIDletJarSize}"/> + <filter token="MIDletJarURL" value="${MIDletJarURL}"/> <filter token="MIDletPermissions" value="${MIDletPermissions}"/> <filter token="MIDletVendor" value="${MIDletVendor}"/> |
|
From: John C. <jc...@us...> - 2007-03-10 04:19:06
|
Update of /cvsroot/tolven/tolvenMobileClient/res/img In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1021/res/img Added Files: bubbles.png Log Message: Add small Tolven logo. --- NEW FILE: bubbles.png --- (This appears to be a binary file; contents omitted.) |
|
From: John C. <jc...@us...> - 2007-03-10 04:18:18
|
Update of /cvsroot/tolven/tolvenMobileServer/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv955/web Removed Files: tolven.jar tolven.jad Log Message: the jad and jar file are now built by tolvenMobileClient --- tolven.jad DELETED --- --- tolven.jar DELETED --- |
|
From: John C. <jc...@us...> - 2007-03-10 04:16:56
|
Update of /cvsroot/tolven/tolvenMobileServer In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32635 Modified Files: build.xml Log Message: Add missing jad file. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolvenMobileServer/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 1 Mar 2007 22:32:04 -0000 1.2 --- build.xml 10 Mar 2007 04:16:55 -0000 1.3 *************** *** 46,49 **** --- 46,50 ---- <zipfileset dir="${tolvenMobileClient.location}/build/"> <include name="*.jar"/> + <include name="*.jad"/> </zipfileset> </jar> |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:53
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/doc/bean Modified Files: Tag: P_JC_DataEntry3 Evaluator.java Log Message: Data entry and drilldown Index: Evaluator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** Evaluator.java 8 Mar 2007 17:09:03 -0000 1.9 --- Evaluator.java 10 Mar 2007 04:13:22 -0000 1.9.2.1 *************** *** 130,133 **** --- 130,136 ---- app.setDocument( docXML); app.init(menuLocal, workingMemory); + + app.removeReferencingMenuData( docXML); + // Assert the document itself. workingMemory.assertObject(docXML); |
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/trim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/trim Modified Files: Tag: P_JC_DataEntry3 TelecommunicationAddressUse.java ActRelationshipSplit.java ActClass.java ContextControl.java ActMood.java RoleLinkType.java EntityDeterminer.java ObjectFactory.java ActStatusSlot.java Observation.java ActBind.java Trim.java EntityNamePartType.java CV.java package-info.java RoleClass.java IVLINT.java EntityClass.java CDSlot.java RealmCode.java OutboundActRelationship.java RoleReference.java CESlot.java EntityNameUse.java Slot.java II.java TsBoundary.java IntegrityCheckAlgorithm.java RoleBind.java GTSSlot.java ActRelationshipJoin.java TELFieldType.java ParticipationType.java ParticipationSubset.java AddressPartType.java GTS.java ActReference.java URL.java ST.java ObservationValueSlot.java IVLINTSlot.java CR.java ActStatus.java RoleParticipation.java InboundActRelationship.java RoleStatus.java SETCESlot.java RoleSlot.java EntityStatus.java ParticipationSignature.java IVLTS.java CD.java PQ.java ActParticipation.java NullFlavor.java ActRelationshipType.java TSSlot.java BL.java ActRelationshipCheckpoint.java AddressUse.java ActNull.java ActRelationshipSubset.java IntegrityCheckType.java RoleInternal.java PostalAddressUse.java ED.java Participation.java BLSlot.java DataType.java STSlot.java RoleNull.java ActSlot.java EntityNamePartQualifier.java UpdateCode.java BinaryDataEncoding.java IntegrityCheck.java RelationshipConjunction.java CompressionAlgorithm.java ActRelationship.java SETIISlot.java ActInternal.java SetOperator.java TimingEvent.java Act.java Role.java EDSlot.java CE.java Added Files: Tag: P_JC_DataEntry3 NewFacet.java NewFacetInput.java NewFacetDefault.java ConcreteDatatype.java NewFacetLabel.java NewFacetValidate.java Removed Files: Tag: P_JC_DataEntry3 RoleParticipations.java ActParticipations.java Log Message: Data entry and drilldown Index: EntityStatus.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityStatus.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** EntityStatus.java 16 Feb 2007 03:58:26 -0000 1.2 --- EntityStatus.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: BLSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BLSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** BLSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- BLSlot.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActMood.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActMood.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActMood.java 16 Feb 2007 03:58:25 -0000 1.2 --- ActMood.java 10 Mar 2007 04:13:22 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: SetOperator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SetOperator.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** SetOperator.java 16 Feb 2007 03:58:26 -0000 1.2 --- SetOperator.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: EDSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EDSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** EDSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- EDSlot.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: InboundActRelationship.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/InboundActRelationship.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** InboundActRelationship.java 16 Feb 2007 03:58:26 -0000 1.2 --- InboundActRelationship.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: RelationshipConjunction.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RelationshipConjunction.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** RelationshipConjunction.java 16 Feb 2007 03:58:26 -0000 1.2 --- RelationshipConjunction.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: OutboundActRelationship.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/OutboundActRelationship.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** OutboundActRelationship.java 16 Feb 2007 03:58:26 -0000 1.2 --- OutboundActRelationship.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActBind.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActBind.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActBind.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActBind.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: EntityDeterminer.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityDeterminer.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** EntityDeterminer.java 16 Feb 2007 03:58:26 -0000 1.2 --- EntityDeterminer.java 10 Mar 2007 04:13:22 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: IVLINT.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IVLINT.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** IVLINT.java 16 Feb 2007 03:58:26 -0000 1.2 --- IVLINT.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: RoleParticipation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleParticipation.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** RoleParticipation.java 16 Feb 2007 03:58:26 -0000 1.2 --- RoleParticipation.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: DataType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/DataType.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** DataType.java 16 Feb 2007 03:58:26 -0000 1.2 --- DataType.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: EntityNamePartQualifier.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/EntityNamePartQualifier.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** EntityNamePartQualifier.java 16 Feb 2007 03:58:26 -0000 1.2 --- EntityNamePartQualifier.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: GTSSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/GTSSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** GTSSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- GTSSlot.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: BinaryDataEncoding.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/BinaryDataEncoding.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** BinaryDataEncoding.java 16 Feb 2007 03:58:26 -0000 1.2 --- BinaryDataEncoding.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: AddressPartType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/AddressPartType.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** AddressPartType.java 16 Feb 2007 03:58:26 -0000 1.2 --- AddressPartType.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActClass.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActClass.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActClass.java 16 Feb 2007 03:58:25 -0000 1.2 --- ActClass.java 10 Mar 2007 04:13:22 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // --- NEW FILE: ConcreteDatatype.java --- // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2007.03.08 at 11:30:35 PM PST // package org.tolven.trim; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; /** * <p>Java class for ConcreteDatatype. * * <p>The following schema fragment specifies the expected content contained within this class. * <p> * <pre> * <simpleType name="ConcreteDatatype"> * <restriction base="{urn:tolven-org:trim:4.0}cs"> * <enumeration value="BL"/> * <enumeration value="TS"/> * <enumeration value="ST"/> * <enumeration value="ED"/> * <enumeration value="IVLTS"/> * <enumeration value="PQ"/> * <enumeration value="INT"/> * <enumeration value="REAL"/> * <enumeration value="II"/> * <enumeration value="CD"/> * <enumeration value="CE"/> * <enumeration value="CS"/> * <enumeration value="CO"/> * <enumeration value="IVLPQ"/> * </restriction> * </simpleType> * </pre> * */ @XmlType(name = "ConcreteDatatype") @XmlEnum public enum ConcreteDatatype { BL, TS, ST, ED, IVLTS, PQ, INT, REAL, II, CD, CE, CS, CO, IVLPQ; public String value() { return name(); } public static ConcreteDatatype fromValue(String v) { return valueOf(v); } } Index: ActRelationshipJoin.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipJoin.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActRelationshipJoin.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActRelationshipJoin.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // --- NEW FILE: NewFacet.java --- // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2007.03.08 at 11:30:35 PM PST // package org.tolven.trim; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; /** * <p>Java class for NewFacet complex type. * * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> * <complexType name="NewFacet"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="label" type="{urn:tolven-org:trim:4.0}NewFacetLabel" minOccurs="0"/> * <element name="input" type="{urn:tolven-org:trim:4.0}NewFacetInput" minOccurs="0"/> * <element name="default" type="{urn:tolven-org:trim:4.0}NewFacetDefault" minOccurs="0"/> * <element name="validate" type="{urn:tolven-org:trim:4.0}NewFacetValidate" minOccurs="0"/> * </sequence> * <attribute name="datatype" type="{urn:tolven-org:trim:4.0}ConcreteDatatype" /> * </restriction> * </complexContent> * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "NewFacet", propOrder = { "label", "input", "_default", "validate" }) public abstract class NewFacet { protected NewFacetLabel label; protected NewFacetInput input; @XmlElement(name = "default") protected NewFacetDefault _default; protected NewFacetValidate validate; @XmlAttribute protected ConcreteDatatype datatype; /** * Gets the value of the label property. * * @return * possible object is * {@link NewFacetLabel } * */ public NewFacetLabel getLabel() { return label; } /** * Sets the value of the label property. * * @param value * allowed object is * {@link NewFacetLabel } * */ public void setLabel(NewFacetLabel value) { this.label = value; } /** * Gets the value of the input property. * * @return * possible object is * {@link NewFacetInput } * */ public NewFacetInput getInput() { return input; } /** * Sets the value of the input property. * * @param value * allowed object is * {@link NewFacetInput } * */ public void setInput(NewFacetInput value) { this.input = value; } /** * Gets the value of the default property. * * @return * possible object is * {@link NewFacetDefault } * */ public NewFacetDefault getDefault() { return _default; } /** * Sets the value of the default property. * * @param value * allowed object is * {@link NewFacetDefault } * */ public void setDefault(NewFacetDefault value) { this._default = value; } /** * Gets the value of the validate property. * * @return * possible object is * {@link NewFacetValidate } * */ public NewFacetValidate getValidate() { return validate; } /** * Sets the value of the validate property. * * @param value * allowed object is * {@link NewFacetValidate } * */ public void setValidate(NewFacetValidate value) { this.validate = value; } /** * Gets the value of the datatype property. * * @return * possible object is * {@link ConcreteDatatype } * */ public ConcreteDatatype getDatatype() { return datatype; } /** * Sets the value of the datatype property. * * @param value * allowed object is * {@link ConcreteDatatype } * */ public void setDatatype(ConcreteDatatype value) { this.datatype = value; } } Index: STSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/STSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** STSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- STSlot.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActRelationshipSubset.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipSubset.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActRelationshipSubset.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActRelationshipSubset.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActSlot.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActStatus.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatus.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActStatus.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActStatus.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // --- NEW FILE: NewFacetDefault.java --- // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2007.03.08 at 11:30:35 PM PST // package org.tolven.trim; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * <p>Java class for NewFacetDefault complex type. * * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> * <complexType name="NewFacetDefault"> * <simpleContent> * <extension base="<urn:tolven-org:trim:4.0>st"> * <attribute name="language" type="{urn:tolven-org:trim:4.0}cs" /> * <attribute name="special" type="{http://www.w3.org/2001/XMLSchema}string" /> * </extension> * </simpleContent> * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "NewFacetDefault", propOrder = { "value" }) public class NewFacetDefault { @XmlValue protected String value; @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String language; @XmlAttribute protected String special; /** * Gets the value of the value property. * * @return * possible object is * {@link String } * */ public String getValue() { return value; } /** * Sets the value of the value property. * * @param value * allowed object is * {@link String } * */ public void setValue(String value) { this.value = value; } /** * Gets the value of the language property. * * @return * possible object is * {@link String } * */ public String getLanguage() { return language; } /** * Sets the value of the language property. * * @param value * allowed object is * {@link String } * */ public void setLanguage(String value) { this.language = value; } /** * Gets the value of the special property. * * @return * possible object is * {@link String } * */ public String getSpecial() { return special; } /** * Sets the value of the special property. * * @param value * allowed object is * {@link String } * */ public void setSpecial(String value) { this.special = value; } } Index: PostalAddressUse.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/PostalAddressUse.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** PostalAddressUse.java 16 Feb 2007 03:58:26 -0000 1.2 --- PostalAddressUse.java 10 Mar 2007 04:13:25 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActRelationshipType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipType.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActRelationshipType.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActRelationshipType.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: NullFlavor.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/NullFlavor.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** NullFlavor.java 16 Feb 2007 03:58:26 -0000 1.2 --- NullFlavor.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: TelecommunicationAddressUse.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/TelecommunicationAddressUse.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** TelecommunicationAddressUse.java 16 Feb 2007 03:58:25 -0000 1.2 --- TelecommunicationAddressUse.java 10 Mar 2007 04:13:22 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: RoleSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/RoleSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** RoleSlot.java 16 Feb 2007 03:58:25 -0000 1.2 --- RoleSlot.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ParticipationType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationType.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ParticipationType.java 16 Feb 2007 03:58:26 -0000 1.2 --- ParticipationType.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // --- NEW FILE: NewFacetInput.java --- // // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.1.2-b01-fcs // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2007.03.08 at 11:30:35 PM PST // package org.tolven.trim; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * <p>Java class for NewFacetInput complex type. * * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> * <complexType name="NewFacetInput"> * <simpleContent> * <extension base="<urn:tolven-org:trim:4.0>st"> * <attribute name="language" type="{urn:tolven-org:trim:4.0}cs" /> * <attribute name="type" type="{urn:tolven-org:trim:4.0}cs" /> * </extension> * </simpleContent> * </complexType> * </pre> * * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "NewFacetInput", propOrder = { "value" }) public class NewFacetInput { @XmlValue protected String value; @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String language; @XmlAttribute @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String type; /** * Gets the value of the value property. * * @return * possible object is * {@link String } * */ public String getValue() { return value; } /** * Sets the value of the value property. * * @param value * allowed object is * {@link String } * */ public void setValue(String value) { this.value = value; } /** * Gets the value of the language property. * * @return * possible object is * {@link String } * */ public String getLanguage() { return language; } /** * Sets the value of the language property. * * @param value * allowed object is * {@link String } * */ public void setLanguage(String value) { this.language = value; } /** * Gets the value of the type property. * * @return * possible object is * {@link String } * */ public String getType() { return type; } /** * Sets the value of the type property. * * @param value * allowed object is * {@link String } * */ public void setType(String value) { this.type = value; } } Index: Observation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/Observation.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** Observation.java 16 Feb 2007 03:58:26 -0000 1.2 --- Observation.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: IntegrityCheckType.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/IntegrityCheckType.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** IntegrityCheckType.java 16 Feb 2007 03:58:26 -0000 1.2 --- IntegrityCheckType.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ParticipationSubset.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ParticipationSubset.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ParticipationSubset.java 16 Feb 2007 03:58:26 -0000 1.2 --- ParticipationSubset.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: CD.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/CD.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** CD.java 16 Feb 2007 03:58:26 -0000 1.2 --- CD.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActStatusSlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActStatusSlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActStatusSlot.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActStatusSlot.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActRelationshipCheckpoint.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActRelationshipCheckpoint.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActRelationshipCheckpoint.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActRelationshipCheckpoint.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ActParticipation.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ActParticipation.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ActParticipation.java 16 Feb 2007 03:58:26 -0000 1.2 --- ActParticipation.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: SETCESlot.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/SETCESlot.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** SETCESlot.java 16 Feb 2007 03:58:25 -0000 1.2 --- SETCESlot.java 10 Mar 2007 04:13:24 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // Index: ObjectFactory.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/ObjectFactory.java,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** ObjectFactory.java 16 Feb 2007 03:58:26 -0000 1.2 --- ObjectFactory.java 10 Mar 2007 04:13:23 -0000 1.2.6.1 *************** *** 3,7 **** // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.02.15 at 12:24:57 AM PST // --- 3,7 ---- // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. ! // Generated on: 2007.03.08 at 11:30:35 PM PST // *************** *** 38,222 **** /** ! * Create an instance of {@link ActParticipation } * */ ! public ActParticipation createActParticipation() { ! return new ActParticipation(); } /** ! * Create an instance of {@link ActInternal } * */ ! public ActInternal createActInternal() { ! return new ActInternal(); } /** ! * Create an instance of {@link ActStatusSlot } * */ ! public ActStatusSlot createActStatusSlot() { ! return new ActStatusSlot(); } /** ! * Create an instance of {@link GTS } * */ ! public GTS createGTS() { ! return new GTS(); } /** ! * Create an instance of {@link TELFieldType } * */ ! public TELFieldType createTELFieldType() { ! return new TELFieldType(); } /** ! * Create an instance of {@link OutboundActRelationship } * */ ! public OutboundActRelationship createOutboundActRelationship() { ! return new OutboundActRelationship(); } /** ! * Create an instance of {@link SETCESlot } * */ ! public SETCESlot createSETCESlot() { ! return new SETCESlot(); } /** ! * Create an instance of {@link II } * */ ! public II createII() { ! return new II(); } /** ! * Create an instance of {@link IntegrityCheck } * */ ! public IntegrityCheck createIntegrityCheck() { ! return new IntegrityCheck(); } /** ! * Create an instance of {@link InboundActRelationship } * */ ! public InboundActRelationship createInboundActRelationship() { ! return new InboundActRelationship(); } /** ! * Create an instance of {@link CR } * */ ! public CR createCR() { ! return new CR(); } /** ! * Create an instance of {@link Observation } * */ ! public Observation createObservation() { ! return new Observation(); } /** ! * Create an instance of {@link RoleNull } * */ ! public RoleNull createRoleNull() { ! return new RoleNull(); } /** ! * Create an instance of {@link BLSlot } * */ ! public BLSlot createBLSlot() { ! return new BLSlot(); } /** ! * Create an instance of {@link ActReference } * */ ! public ActReference createActReference() { ! return new ActReference(); } /** ! * Create an instance of {@link RoleBind } * */ ! public RoleBind createRoleBind() { ! return new RoleBind(); } /** ! * Create an instance of {@link IntegrityCheckType } * */ ! public IntegrityCheckType createIntegrityCheckType() { ! return new IntegrityCheckType(); } /** ! * Create an instance of {@link DataType } * */ ! public DataType createDataType() { ! return new DataType(); } /** ! * Create an instance of {@link CDSlot } * */ ! public CDSlot createCDSlot() { ! return new CDSlot(); } /** ! * Create an instance of {@link Trim } * */ ! public Trim createTrim() { ! return new Trim(); } /** ! * Create an instance of {@link STSlot } * */ ! public STSlot createSTSlot() { ! return new STSlot(); } /** ! * Create an instance of {@link Role } * */ ! public Role createRole() { ! return new Role(); } /** ! * Create an instance of {@link ObservationValueSlot } * */ ! public ObservationValueSlot createObservationValueSlot() { ! return new ObservationValueSlot(); } --- 38,222 ---- /** ! * Create an instance of {@link Trim } * */ ! public Trim createTrim() { ! return new Trim(); } /** ! * Create an instance of {@link Role } * */ ! public Role createRole() { ! return new Role(); } /** ! * Create an instance of {@link CDSlot } * */ ! public CDSlot createCDSlot() { ! return new CDSlot(); } /** ! * Create an instance of {@link EDSlot } * */ ! public EDSlot createEDSlot() { ! return new EDSlot(); } /** ! * Create an instance of {@link STSlot } * */ ! public STSlot createSTSlot() { ! return new STSlot(); } /** ! * Create an instance of {@link ObservationValueSlot } * */ ! public ObservationValueSlot createObservationValueSlot() { ! return new ObservationValueSlot(); } /** ! * Create an instance of {@link TSSlot } * */ ! public TSSlot createTSSlot() { ! return new TSSlot(); } /** ! * Create an instance of {@link ActNull } * */ ! public ActNull createActNull() { ! return new ActNull(); } /** ! * Create an instance of {@link OutboundActRelationship } * */ ! public OutboundActRelationship createOutboundActRelationship() { ! return new OutboundActRelationship(); } /** ! * Create an instance of {@link NewFacetInput } * */ ! public NewFacetInput createNewFacetInput() { ! return new NewFacetInput(); } /** ! * Create an instance of {@link IVLINTSlot } * */ ! public IVLINTSlot createIVLINTSlot() { ! return new IVLINTSlot(); } /** ! * Create an instance of {@link IntegrityCheck } * */ ! public IntegrityCheck createIntegrityCheck() { ! return new IntegrityCheck(); } /** ! * Create an instance of {@link ED } * */ ! public ED createED() { ! return new ED(); } /** ! * Create an instance of {@link Act } * */ ! public Act createAct() { ! return new Act(); } /** ! * Create an instance of {@link IVLTS } * */ ! public IVLTS createIVLTS() { ! return new IVLTS(); } /** ! * Create an instance of {@link NewFacetValidate } * */ ! public NewFacetValidate createNewFacetValidate() { ! return new NewFacetValidate(); } /** ! * Create an instance of {@link BL } * */ ! public BL createBL() { ! return new BL(); } /** ! * Create an instance of {@link II } * */ ! public II createII() { ! return new II(); } /** ! * Create an instance of {@link SETCESlot } * */ ! public SETCESlot createSETCESlot() { ! return new SETCESlot(); } /** ! * Create an instance of {@link RoleReference } * */ ! public RoleReference createRoleReference() { ! return new RoleReference(); } /** ! * Create an instance of {@link ActInternal } * */ ! public ActInternal createActInternal() { ! return new ActInternal(); } /** ! * Create an instance of {@link NewFacetLabel } * */ ! public NewFacetLabel createNewFacetLabel() { ! return new NewFacetLabel(); } /** ! * Create an instance of {@link GTS } * */ ! public GTS createGTS() { ! return new GTS(); } *************** *** 230,278 **** /** ! * Create an instance of {@link CV } * */ ! public CV createCV() { ! return new CV(); } /** ! * Create an instance of {@link CE } * */ ! public CE createCE() { ! return new CE(); } /** ! * Create an instance of {@link IVLINT } * */ ! public IVLINT createIVLINT() { ! return new IVLINT(); } /** ! * Create an instance of {@link ActNull } * */ ! public ActNull createActNull() { ! return new ActNull(); } /** ! * Create an instance of {@link GTSSlot } * */ ! public GTSSlot createGTSSlot() { ! return new GTSSlot(); } /** ! * Create an instance of {@link IVLTS } * */ ! public IVLTS createIVLTS() { ! return new IVLTS(); } --- 230,294 ---- /** ! * Create an instance of {@link NewFacetDefault } * */ ! public NewFacetDefault createNewFacetDefault() { ! return new NewFacetDefault(); } /** ! * Create an instance of {@link IntegrityCheckType } * */ ! public IntegrityCheckType createIntegrityCheckType() { ! return new IntegrityCheckType(); } /** ! * Create an instance of {@link ActRelationship } * */ ! public ActRelationship createActRelationship() { ! return new ActRelationship(); } /** ! * Create an instance of {@link DataType } * */ ! public DataType createDataType() { ! return new DataType(); } /** ! * Create an instance of {@link TELFieldType } * */ ! public TELFieldType createTELFieldType() { ! return new TELFieldType(); } /** ! * Create an instance of {@link ActBind } * */ ! public ActBind createActBind() { ! return new ActBind(); ! } ! ! /** ! * Create an instance of {@link ST } ! * ! */ ! public ST createST() { ! return new ST(); ! } ! ! /** ! * Create an instance of {@link CV } ! * ! */ ! public CV createCV() { ! return new CV(); } *************** *** 286,310 **** /** ! * Create an instance of {@link TSSlot } * */ ! public TSSlot createTSSlot() { ! return new TSSlot(); } /** ! * Create an instance of {@link TsBoundary } * */ ! public TsBoundary createTsBoundary() { ! return new TsBoundary(); } /** ! * Create an instance of {@link RoleParticipation } * */ ! public RoleParticipation createRoleParticipation() { ! return new RoleParticipation(); } --- 302,334 ---- /** ! * Create an instance of {@link GTSSlot } * */ ! public GTSSlot createGTSSlot() { ! return new GTSSlot(); } /** ! * Create an instance of {@link ActParticipation } * */ ! public ActParticipation createActParticipation() { ! return new ActParticipation(); } /** ! * Create an instance of {@link BLSlot } * */ ! public BLSlot createBLSlot() { ! return new BLSlot(); ! } ! ! /** ! * Create an instance of {@link RoleBind } ! * ! */ ! public RoleBind createRoleBind() { ! return new RoleBind(); } *************** *** 318,398 **** /** ! * Create an instance of {@link Act } * */ ! public Act createAct() { ! return new Act(); } /** ! * Create an instance of {@link ED } * */ ! public ED createED() { ! return new ED(); } /** ! * Create an instance of {@link RoleReference } * */ ! public RoleReference createRoleReference() { ! return new RoleReference(); } /** ! * Create an instance of {@link BL } * */ ! public BL createBL() { ! return new BL(); } /** ! * Create an instance of {@link IVLINTSlot } * */ ! public IVLINTSlot createIVLINTSlot() { ! return new IVLINTSlot(); } /** ! * Create an instance of {@link ST } * */ ! public ST createST() { ! return new ST(); } /** ! * Create an instance of {@link EDSlot } * */ ! public EDSlot createEDSlot() { ! return new EDSlot(); } /** ! * Create an instance of {@link CD } * */ ! public CD createCD() { ! return new CD(); } /** ! * Create an instance of {@link ActBind } * */ ! public ActBind createActBind() { ! return new ActBind(); } /** ! * Create an instance of {@link ActRelationship } * */ ! public ActRelationship createActRelationship() { ! return new ActRelationship(); } --- 342,422 ---- /** ! * Create an instance of {@link ActStatusSlot } * */ ! public ActStatusSlot createActStatusSlot() { ! return new ActStatusSlot(); } /** ! * Create an instance of {@link ActReference } * */ ! public ActReference createActReference() { ! return new ActReference(); ... [truncated message content] |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:28
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/app/bean Modified Files: Tag: P_JC_DataEntry3 TrimBean.java AppEvalAdaptor.java MenuBean.java CreatorBean.java Log Message: Data entry and drilldown Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.50 retrieving revision 1.50.2.1 diff -C2 -d -r1.50 -r1.50.2.1 *** MenuBean.java 8 Mar 2007 17:13:19 -0000 1.50 --- MenuBean.java 10 Mar 2007 04:13:27 -0000 1.50.2.1 *************** *** 36,39 **** --- 36,40 ---- import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountType; + import org.tolven.core.entity.Status; import org.tolven.doc.XMLLocal; import org.tolven.trim.Act; *************** *** 166,170 **** // // If the MenuStructure we're looking at is a reference, then we're really going after the referenced items but // // using the reference as a selector. ! qs.append(" md.menuStructure = :m"); // Add any parent keys we may have for ( int x = 0; x < 4; x++ ) { --- 167,172 ---- // // If the MenuStructure we're looking at is a reference, then we're really going after the referenced items but // // using the reference as a selector. ! qs.append(" ( md.deleted is null OR md.deleted = false) " ); ! qs.append(" AND md.menuStructure = :m"); // Add any parent keys we may have for ( int x = 0; x < 4; x++ ) { *************** *** 287,295 **** */ public int removeReferencingMenuData( long accountId, long documentId) { ! if (0!=documentId) return 0; ! Query query = em.createQuery("DELETE FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId"); ! query.setParameter( "account", accountId ); ! query.setParameter( "docId", documentId ); ! return query.executeUpdate(); } --- 289,316 ---- */ public int removeReferencingMenuData( long accountId, long documentId) { ! System.out.println( "***** Remove MD references to document " + documentId ); ! if (0==documentId) return 0; ! int count = 0; ! if (true) { ! ! Query query = em.createQuery("select md FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId"); ! query.setParameter( "account", accountId ); ! query.setParameter( "docId", documentId ); ! List<MenuData> results = query.getResultList(); ! count = results.size(); ! for (MenuData md : results) { ! md.setDeleted(true); ! em.merge(md); // Not really needed ! System.out.println( "Remove " + md.getPath() ); ! // em.remove(md); ! } ! } else { ! Query query = em.createQuery("DELETE FROM MenuData md WHERE md.account.id = :account and md.documentId = :docId"); ! query.setParameter( "account", accountId ); ! query.setParameter( "docId", documentId ); ! count = query.executeUpdate(); ! } ! System.out.println( "***** Delete done ****" ); ! return count; } *************** *** 717,722 **** // em.persist( newBCC ); } ! MenuStructure obs = new MenuStructure( ! account, doc, "bar3.xhtml", null, 4, "obs", "Observations", "true", null, "tab" ); em.persist( obs ); --- 738,743 ---- // em.persist( newBCC ); } ! MenuStructure obs = new MenuStructure( ! account, doc, "bar3.xhtml", null, 1, "obs", "Observations", "true", null, "tab" ); em.persist( obs ); Index: CreatorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/CreatorBean.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** CreatorBean.java 8 Mar 2007 17:13:19 -0000 1.5 --- CreatorBean.java 10 Mar 2007 04:13:27 -0000 1.5.2.1 *************** *** 27,30 **** --- 27,31 ---- import org.tolven.ccr.ContinuityOfCareRecord; import org.tolven.core.ActivationLocal; + import org.tolven.core.entity.Status; import org.tolven.core.entity.TolvenUser; import org.tolven.core.util.Queuer; *************** *** 90,93 **** --- 91,95 ---- public void scanAct( Act act, List<MenuPath> context ) { + for (ActParticipation part : act.getParticipations()) { if (part.getRole() instanceof Role) { *************** *** 266,270 **** md.setString01(((Act)actSlot).getTitle().getST().getValue()); } ! md.setString02( "new"); md.setDocumentId(docXML.getId()); menuBean.persistMenuData(md); --- 268,272 ---- md.setString01(((Act)actSlot).getTitle().getST().getValue()); } ! md.setStatus( Status.NEW ); md.setDocumentId(docXML.getId()); menuBean.persistMenuData(md); *************** *** 276,280 **** mdToDo.setReference(md); mdToDo.setDate01(md.getDate01()); ! mdToDo.setString01(md.getParent01().getString01()); // mdToDo.setParent01(md.getParent01()); mdToDo.setString02("Unfinished " + md.getString01()); --- 278,282 ---- mdToDo.setReference(md); mdToDo.setDate01(md.getDate01()); ! mdToDo.setString01(md.getParent01().getString02() + " " + md.getParent01().getString01()); // mdToDo.setParent01(md.getParent01()); mdToDo.setString02("Unfinished " + md.getString01()); Index: TrimBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/TrimBean.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** TrimBean.java 8 Mar 2007 17:13:19 -0000 1.1 --- TrimBean.java 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 138,147 **** } /** * Load all trim objects found in the trim/ resource directory of the jar file. * @throws IOException, JAXBException */ ! public void loadTrim( URL url ) throws IOException, JAXBException { ! // System.out.println( "URL=" + url.getFile()); --- 138,165 ---- } + public void loadTRIM( String name, String resourceName ) throws IOException, JAXBException { + InputStream input = new BufferedInputStream( Thread.currentThread().getContextClassLoader().getResourceAsStream((resourceName))); + ByteArrayOutputStream trimXML = new ByteArrayOutputStream( ); + int b; + while( (b = input.read()) >=0 ) { + trimXML.write(b); + } + // String templateName = file.getName().substring(0, file.getName().length()-EXTENSION.length()); + loadTRIM( name, trimXML.toByteArray()); + input.close(); + } + /** * Load all trim objects found in the trim/ resource directory of the jar file. * @throws IOException, JAXBException */ ! public void loadAllTRIM( ) throws IOException, JAXBException { ! loadTRIM( "bloodPressure", "trim/bloodPressure.trim"); ! loadTRIM( "bodyMassIndex", "trim/bodyMassIndex.trim"); ! loadTRIM( "glucose", "trim/glucose.trim"); ! loadTRIM( "pulse", "trim/pulse.trim"); ! loadTRIM( "rash", "trim/rash.trim"); ! loadTRIM( "temperature", "trim/temperature.trim"); ! loadTRIM( "weight", "trim/weight.trim"); // System.out.println( "URL=" + url.getFile()); *************** *** 163,178 **** // for (File file : files) { // InputStream input = new BufferedInputStream( new FileInputStream(file)); - InputStream input = new BufferedInputStream( Thread.currentThread().getContextClassLoader().getResourceAsStream(("trim/weight.trim"))); - ByteArrayOutputStream trimXML = new ByteArrayOutputStream( ); - int b; - while( (b = input.read()) >=0 ) { - trimXML.write(b); - } - // String templateName = file.getName().substring(0, file.getName().length()-EXTENSION.length()); - String templateName = "Weight"; - loadTRIM( templateName, trimXML.toByteArray()); - // } } } --- 181,187 ---- // for (File file : files) { // InputStream input = new BufferedInputStream( new FileInputStream(file)); } + } Index: AppEvalAdaptor.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/AppEvalAdaptor.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** AppEvalAdaptor.java 8 Mar 2007 17:13:19 -0000 1.5 --- AppEvalAdaptor.java 10 Mar 2007 04:13:26 -0000 1.5.2.1 *************** *** 2,5 **** --- 2,6 ---- import java.io.ByteArrayOutputStream; + import java.text.ParseException; import java.util.ArrayList; import java.util.List; *************** *** 10,13 **** --- 11,15 ---- import org.tolven.app.entity.MenuStructure; import org.tolven.core.entity.Account; + import org.tolven.core.entity.Status; import org.tolven.core.entity.TolvenUser; import org.tolven.doc.entity.DocBase; *************** *** 16,19 **** --- 18,22 ---- import org.tolven.trim.ActSlot; import org.tolven.trim.Trim; + import org.tolven.trim.util.TrimFactory; /** *************** *** 100,103 **** --- 103,108 ---- * the document when it was mutable, such as on to do lists. This function is usually called within the transaction that * creates the index items associated with the document in immutable form. + * the other purpose for this function is to "level-the-playing-field for external vs internally generated + * data. In other words, the rules can behave the same regardless of the origin of the data. * @param docBase */ *************** *** 172,179 **** md.setAccount(getAccount()); md.setParent01(mdParent01); ! ! // md.setDate01(act.getEffectiveTime().getTS()); md.setString01(act.getTitle().getST().getValue()); ! // md.setString02( "new"); md.setDocumentId(getDocument().getId()); menuBean.persistMenuData(md); --- 177,189 ---- md.setAccount(getAccount()); md.setParent01(mdParent01); ! TrimFactory tf = new TrimFactory(); ! try { ! md.setDate01(tf.toDate(act.getEffectiveTime())); ! } catch (ParseException e) { ! System.out.println( "Can't convert effectiveTime: " + act.getEffectiveTime().getTS().get(0)); ! e.printStackTrace(); ! } md.setString01(act.getTitle().getST().getValue()); ! md.setStatus( Status.ACTIVE ); md.setDocumentId(getDocument().getId()); menuBean.persistMenuData(md); |
Update of /cvsroot/tolven/tolvenEJB/resources/trim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/resources/trim Modified Files: Tag: P_JC_DataEntry3 temperature.trim bloodPressure.trim bodyMassIndex.trim glucose.trim rash.trim pulse.trim Log Message: Data entry and drilldown Index: pulse.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/pulse.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** pulse.trim 8 Mar 2007 17:00:19 -0000 1.1 --- pulse.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 4,8 **** xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>glucose.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> --- 4,8 ---- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>pulse.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> Index: temperature.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/temperature.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** temperature.trim 8 Mar 2007 17:00:14 -0000 1.1 --- temperature.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 4,8 **** xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>gcs.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> --- 4,8 ---- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>temperature.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> Index: bloodPressure.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/bloodPressure.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** bloodPressure.trim 8 Mar 2007 17:00:18 -0000 1.1 --- bloodPressure.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 4,8 **** xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>gcs.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> --- 4,8 ---- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>bloodPressure.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> Index: glucose.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/glucose.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** glucose.trim 8 Mar 2007 17:00:13 -0000 1.1 --- glucose.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 18,24 **** <ST>Serum Glucose</ST> </title> ! <effectiveTime> ! <TS>tbd</TS> ! </effectiveTime> <observation> <value> --- 18,28 ---- <ST>Serum Glucose</ST> </title> ! <!-- effectiveTime> ! <new datatype="TS"> ! <label language="en">Observation time</label> ! <input type="dateTime"/> ! <default special="now"/> ! </new> ! </effectiveTime --> <observation> <value> Index: bodyMassIndex.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/bodyMassIndex.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** bodyMassIndex.trim 8 Mar 2007 17:00:14 -0000 1.1 --- bodyMassIndex.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 4,8 **** xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>glucose.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> --- 4,8 ---- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>bodyMassIndex.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> Index: rash.trim =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/trim/rash.trim,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** rash.trim 8 Mar 2007 17:00:19 -0000 1.1 --- rash.trim 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 4,8 **** xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>glucose.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> --- 4,8 ---- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tolven-org:trim:4.0 E:\tolvenWS\tolvenEJB\resources\xsd\trim4.xsd"> ! <page>rash.xhtml</page> <instance>ephr:patient:observation</instance> <menu>ephr:obsMenu</menu> |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:28
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/app/entity Modified Files: Tag: P_JC_DataEntry3 MenuData.java Log Message: Data entry and drilldown Index: MenuData.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/entity/MenuData.java,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -C2 -d -r1.18 -r1.18.2.1 *** MenuData.java 8 Mar 2007 17:11:54 -0000 1.18 --- MenuData.java 10 Mar 2007 04:13:27 -0000 1.18.2.1 *************** *** 92,95 **** --- 92,98 ---- @Enumerated(EnumType.STRING) private Status status; + + @Column( name="DELETED") + private Boolean deleted; @Column( name="PARENT_PATH01") *************** *** 943,946 **** --- 946,955 ---- this.status = status; } + public Boolean getDeleted() { + return deleted; + } + public void setDeleted(Boolean deleted) { + this.deleted = deleted; + } } |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:28
|
Update of /cvsroot/tolven/tolvenEJB/resources/xsd In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/resources/xsd Modified Files: Tag: P_JC_DataEntry3 trim4.xsd Log Message: Data entry and drilldown Index: trim4.xsd =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/xsd/trim4.xsd,v retrieving revision 1.2 retrieving revision 1.2.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** trim4.xsd 16 Feb 2007 03:58:26 -0000 1.2 --- trim4.xsd 10 Mar 2007 04:13:27 -0000 1.2.6.1 *************** *** 11,18 **** <xs:complexType name="Trim"> <xs:sequence> ! <xs:element name="page" type="xs:string" maxOccurs="1"/> ! <xs:element name="instance" type="xs:string" maxOccurs="1"/> <xs:element name="menu" type="xs:string" maxOccurs="unbounded"/> ! <xs:element name="act" type="ActSlot" maxOccurs="1"/> </xs:sequence> </xs:complexType> --- 11,18 ---- <xs:complexType name="Trim"> <xs:sequence> ! <xs:element name="page" type="xs:string"/> ! <xs:element name="instance" type="xs:string"/> <xs:element name="menu" type="xs:string" maxOccurs="unbounded"/> ! <xs:element name="act" type="ActSlot"/> </xs:sequence> </xs:complexType> *************** *** 260,268 **** </xs:complexContent> </xs:complexType> <xs:complexType name="Slot" abstract="true"> <xs:sequence> ! <xs:element name="xxx" type="xs:string" form="qualified" minOccurs="0"/> </xs:sequence> </xs:complexType> <xs:complexType name="BLSlot"> <xs:complexContent> --- 260,313 ---- </xs:complexContent> </xs:complexType> + <xs:complexType name="Slot" abstract="true"> + <xs:choice> + <xs:element name="bind" type="xs:string" minOccurs="0"/> + <xs:element name="new" type="NewFacet" minOccurs="0"/> + </xs:choice> + </xs:complexType> + + <xs:complexType name="NewFacet" abstract="true"> <xs:sequence> ! <xs:element name="label" type="NewFacetLabel" minOccurs="0"/> ! <xs:element name="input" type="NewFacetInput" minOccurs="0" maxOccurs="1"/> ! <xs:element name="default" type="NewFacetDefault" minOccurs="0"/> ! <xs:element name="validate" type="NewFacetValidate" minOccurs="0"/> </xs:sequence> + <xs:attribute name="datatype" type="ConcreteDatatype"/> + </xs:complexType> + + <xs:complexType name="NewFacetLabel"> + <xs:simpleContent> + <xs:extension base="st"> + <xs:attribute name="language" type="cs" use="optional"/> + </xs:extension> + </xs:simpleContent> </xs:complexType> + <xs:complexType name="NewFacetInput"> + <xs:simpleContent> + <xs:extension base="st"> + <xs:attribute name="language" type="cs" use="optional"/> + <xs:attribute name="type" type="cs" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:complexType name="NewFacetValidate"> + <xs:simpleContent> + <xs:extension base="st"> + <xs:attribute name="language" type="cs" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:complexType name="NewFacetDefault"> + <xs:simpleContent> + <xs:extension base="st"> + <xs:attribute name="language" type="cs" use="optional"/> + <xs:attribute name="special" type="xs:string" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + <xs:complexType name="BLSlot"> <xs:complexContent> *************** *** 604,607 **** --- 649,672 ---- </xs:restriction> </xs:simpleType> + + <xs:simpleType name="ConcreteDatatype"> + <xs:restriction base="cs"> + <xs:enumeration value="BL"/> + <xs:enumeration value="TS"/> + <xs:enumeration value="ST"/> + <xs:enumeration value="ED"/> + <xs:enumeration value="IVLTS"/> + <xs:enumeration value="PQ"/> + <xs:enumeration value="INT"/> + <xs:enumeration value="REAL"/> + <xs:enumeration value="II"/> + <xs:enumeration value="CD"/> + <xs:enumeration value="CE"/> + <xs:enumeration value="CS"/> + <xs:enumeration value="CO"/> + <xs:enumeration value="IVLPQ"/> + </xs:restriction> + </xs:simpleType> + <xs:simpleType name="AddressPartType"> <xs:restriction base="cs"> |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:28
|
Update of /cvsroot/tolven/tolvenEJB In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151 Modified Files: Tag: P_JC_DataEntry3 build.xml Log Message: Data entry and drilldown Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/build.xml,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -C2 -d -r1.17 -r1.17.2.1 *** build.xml 8 Mar 2007 16:59:12 -0000 1.17 --- build.xml 10 Mar 2007 04:13:27 -0000 1.17.2.1 *************** *** 123,126 **** --- 123,128 ---- <xjc schema="${tolvenEJB.location}/resources/xsd/trim4.xsd" package="org.tolven.trim" destdir="${tolvenEJB.location}/src" extension="true"> + <depends dir="${tolvenEJB.location}/resources/xsd/" includes="trim4.xsd"/> + <produces dir="${tolvenEJB.location}/src" includes="**/*"/> </xjc> </target> |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:27
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/app Modified Files: Tag: P_JC_DataEntry3 TrimLocal.java TrimRemote.java Log Message: Data entry and drilldown Index: TrimRemote.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/TrimRemote.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** TrimRemote.java 8 Mar 2007 17:13:19 -0000 1.1 --- TrimRemote.java 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 1,4 **** --- 1,6 ---- package org.tolven.app; + import java.io.IOException; + import javax.xml.bind.JAXBException; Index: TrimLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/TrimLocal.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** TrimLocal.java 8 Mar 2007 17:13:19 -0000 1.1 --- TrimLocal.java 10 Mar 2007 04:13:26 -0000 1.1.2.1 *************** *** 17,25 **** public void loadTRIM( String name, byte[] trimXML ) throws JAXBException; /** * Load all trim objects found in the trim/ resource directory of the jar file. * @param url base directory containing the trim content */ ! public void loadTrim( URL url ) throws IOException, JAXBException; /** --- 17,27 ---- public void loadTRIM( String name, byte[] trimXML ) throws JAXBException; + public void loadTRIM( String name, String resourceName ) throws IOException, JAXBException; + /** * Load all trim objects found in the trim/ resource directory of the jar file. * @param url base directory containing the trim content */ ! public void loadAllTRIM( ) throws IOException, JAXBException; /** |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:27
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/util In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/src/org/tolven/trim/util Modified Files: Tag: P_JC_DataEntry3 TrimFactory.java Log Message: Data entry and drilldown Index: TrimFactory.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/trim/util/TrimFactory.java,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** TrimFactory.java 4 Feb 2007 16:39:57 -0000 1.1 --- TrimFactory.java 10 Mar 2007 04:13:26 -0000 1.1.6.1 *************** *** 1,6 **** --- 1,8 ---- package org.tolven.trim.util; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; + import java.util.GregorianCalendar; import org.tolven.trim.Act; *************** *** 13,16 **** --- 15,19 ---- import org.tolven.trim.CD; import org.tolven.trim.CE; + import org.tolven.trim.GTSSlot; import org.tolven.trim.II; import org.tolven.trim.InboundActRelationship; *************** *** 92,95 **** --- 95,115 ---- } + /** + * Attempt to return a GTS slot as a single value. If not possible, then return null. + * The cause can be determined by futher analysis. + * @param GTSSlot + * @return date + * @throws ParseException + */ + public Date toDate( GTSSlot gts ) throws ParseException { + if (gts==null) return null; + if (gts.getNull()!=null) return null; + if (gts.getIVLTS()!=null) return null; + if (gts.getTS()==null) return null; + if (gts.getTS().size()!=1) return null; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssZZ"); + return sdf.parse(gts.getTS().get(0)); + } + public void addEffectiveTimeAsTS( Act act, Date time) { if (null==act.getEffectiveTime()) act.setEffectiveTime(createGTSSlot()); |
|
From: John C. <jc...@us...> - 2007-03-10 04:13:27
|
Update of /cvsroot/tolven/tolvenEJB/resources/rules In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31151/resources/rules Modified Files: Tag: P_JC_DataEntry3 ephr.drl Log Message: Data entry and drilldown Index: ephr.drl =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/resources/rules/ephr.drl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** ephr.drl 8 Mar 2007 17:00:19 -0000 1.2 --- ephr.drl 10 Mar 2007 04:13:26 -0000 1.2.2.1 *************** *** 10,22 **** global org.tolven.app.bean.AppEvalAdaptor app; - rule "Clear temporary menu data" - when - $doc: DocXML() - then - // to start, remove all menudata associated with this document - // We'll decide where it should go in these rule now that the document is submitted. - app.removeReferencingMenuData( $doc ); - end - /** * See what we can do with a TRIM object --- 10,13 ---- |
|
From: John C. <jc...@us...> - 2007-03-10 04:12:09
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30563/src/org/tolven/web Modified Files: Tag: P_JC_DataEntry3 MenuAction.java TolvenContext.java TRIMAction.java Log Message: Data entry and drilldown Index: TolvenContext.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TolvenContext.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** TolvenContext.java 8 Mar 2007 17:07:23 -0000 1.2 --- TolvenContext.java 10 Mar 2007 04:12:08 -0000 1.2.2.1 *************** *** 87,91 **** System.out.println( "One Time Initialization"); initializeAccountTypes(); ! trimBean.loadTrim(Thread.currentThread().getContextClassLoader().getResource("trim")); initialized = true; } --- 87,91 ---- System.out.println( "One Time Initialization"); initializeAccountTypes(); ! trimBean.loadAllTRIM(); initialized = true; } Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.37 retrieving revision 1.37.2.1 diff -C2 -d -r1.37 -r1.37.2.1 *** MenuAction.java 28 Feb 2007 07:04:30 -0000 1.37 --- MenuAction.java 10 Mar 2007 04:12:08 -0000 1.37.2.1 *************** *** 53,56 **** --- 53,57 ---- import org.tolven.app.entity.MenuStructure; import org.tolven.ccr.ContinuityOfCareRecord; + import org.tolven.core.entity.Status; import org.tolven.core.util.Queuer; import org.tolven.doc.DocumentLocal; Index: TRIMAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TRIMAction.java,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** TRIMAction.java 12 Feb 2007 07:09:38 -0000 1.1 --- TRIMAction.java 10 Mar 2007 04:12:08 -0000 1.1.4.1 *************** *** 22,27 **** if (trim==null) { MenuData md = getDrilldownItem(); ! System.out.println( "[getAct] MD.id=" + md.getId()); if (md.getDocumentId()==0) return null; DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { --- 22,28 ---- if (trim==null) { MenuData md = getDrilldownItem(); ! if (md==null) return null; if (md.getDocumentId()==0) return null; + System.out.println( "[getAct] MD.id=" + md.getId()); DocBase doc = documentLocal.findDocument(md.getDocumentId()); if (doc==null) { |
3 messages has been excluded from this view by a project administrator.
