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...> - 2006-09-23 22:19:19
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16486/security-config Modified Files: build.xml Log Message: The location browsable flags are used to distinguish between copying credentials to a location which is local (using std copy) or remote (using scp) Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** build.xml 23 Sep 2006 21:04:20 -0000 1.43 --- build.xml 23 Sep 2006 22:19:16 -0000 1.44 *************** *** 485,490 **** <target name="deploy-ldap-credentials" description="Initialize LDAP for Tolven"> <condition property="deploy-ldap-target" value="deploy-certs-to-localhost-ldap" else="deploy-certs-to-remote-ldap"> ! <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> </condition> <antcall target="${deploy-ldap-target}" /> --- 485,491 ---- <target name="deploy-ldap-credentials" description="Initialize LDAP for Tolven"> + <fail unless="ldap.location.browsable" /> <condition property="deploy-ldap-target" value="deploy-certs-to-localhost-ldap" else="deploy-certs-to-remote-ldap"> ! <equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" /> </condition> <antcall target="${deploy-ldap-target}" /> *************** *** 492,497 **** <target name="deploy-db-credentials" description="Initialize Postgres for Tolven"> <condition property="deploy-pg-target" value="deploy-certs-to-localhost-pg" else="deploy-certs-to-remote-pg"> ! <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> </condition> <antcall target="${deploy-pg-target}" /> --- 493,499 ---- <target name="deploy-db-credentials" description="Initialize Postgres for Tolven"> + <fail unless="postgres.location.browsable" /> <condition property="deploy-pg-target" value="deploy-certs-to-localhost-pg" else="deploy-certs-to-remote-pg"> ! <equals arg1="${postgres.location.browsable}" arg2="true" casesensitive="false" /> </condition> <antcall target="${deploy-pg-target}" /> |
|
From: Joseph I. <jos...@us...> - 2006-09-23 21:04:22
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18443/security-config Modified Files: build.xml Log Message: All build internal calls are now called using task <antcaall>, while external build calls use <ant>. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** build.xml 23 Sep 2006 05:03:33 -0000 1.42 --- build.xml 23 Sep 2006 21:04:20 -0000 1.43 *************** *** 78,92 **** <target name="all" depends="password-input"> <delete dir="${tolven.security.build.dir}" /> ! <ant target="create-tolvendev-ca-cert" /> ! <ant target="create-tolvendev-ldap-cert" /> ! <ant target="create-tolvendev-db-cert" /> ! <ant target="create-tolvendev-jboss-keystore" /> ! <ant target="create-tolvendev-ldap-cacerts" /> ! <ant target="create-tolvendev-db-cacerts" /> ! <ant target="create-tolvendev-jboss-cacerts" /> ! <ant target="create-tolvendev-webserver-keystore" /> ! <ant target="create-ldap-password-file" /> ! <ant target="create-pg-password-file" /> ! <ant target="save-security-credentials" /> <delete dir="${tolven.security.build.dir}" /> </target> --- 78,92 ---- <target name="all" depends="password-input"> <delete dir="${tolven.security.build.dir}" /> ! <antcall target="create-tolvendev-ca-cert" /> ! <antcall target="create-tolvendev-ldap-cert" /> ! <antcall target="create-tolvendev-db-cert" /> ! <antcall target="create-tolvendev-jboss-keystore" /> ! <antcall target="create-tolvendev-ldap-cacerts" /> ! <antcall target="create-tolvendev-db-cacerts" /> ! <antcall target="create-tolvendev-jboss-cacerts" /> ! <antcall target="create-tolvendev-webserver-keystore" /> ! <antcall target="create-ldap-password-file" /> ! <antcall target="create-pg-password-file" /> ! <antcall target="save-security-credentials" /> <delete dir="${tolven.security.build.dir}" /> </target> *************** *** 184,193 **** </condition> <condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore"> ! <and> ! <equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" /> ! <available file="${postgres-client-cert-dir}/postgresql.crt" /> ! </and> </condition> ! <ant target="${db-client-target}" /> </target> --- 184,190 ---- </condition> <condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore"> ! <equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" /> </condition> ! <antcall target="${db-client-target}" /> </target> *************** *** 359,376 **** <move toDir="${tolven.stage}" file="${tolven.security.openssl.ca.dir}" /> <echo message="${tolven.stage}/ca contains the CA certificate and key used to sign all certificates. It, and all private keys, should be carefully protected." /> ! <ant target="update-tolven-stage-ldap" /> ! <ant target="update-tolven-stage-pg" /> ! <ant target="update-tolven-stage-pg-client" /> ! <ant target="update-tolven-stage-jboss" /> ! <ant target="update-tolven-stage-misc" /> ! <ant target="update-tolven-stage-tomcat" /> ! <ant target="display-tolvendev-ca-cert" /> ! <ant target="display-tolvendev-ldap-cert" /> ! <ant target="display-tolvendev-db-cert" /> ! <ant target="display-tolvendev-db-cacerts" /> ! <ant target="display-tolvendev-jboss-keystore" /> ! <ant target="display-tolvendev-ldap-cacerts" /> ! <ant target="display-tolvendev-jboss-cacerts" /> ! <ant target="display-tolvendev-webserver-keystore" /> <echo level="info" message="All credentials have also been moved from ${tolven.stage}." /> </target> --- 356,373 ---- <move toDir="${tolven.stage}" file="${tolven.security.openssl.ca.dir}" /> <echo message="${tolven.stage}/ca contains the CA certificate and key used to sign all certificates. It, and all private keys, should be carefully protected." /> ! <antcall target="update-tolven-stage-ldap" /> ! <antcall target="update-tolven-stage-pg" /> ! <antcall target="update-tolven-stage-pg-client" /> ! <antcall target="update-tolven-stage-jboss" /> ! <antcall target="update-tolven-stage-misc" /> ! <antcall target="update-tolven-stage-tomcat" /> ! <antcall target="display-tolvendev-ca-cert" /> ! <antcall target="display-tolvendev-ldap-cert" /> ! <antcall target="display-tolvendev-db-cert" /> ! <antcall target="display-tolvendev-db-cacerts" /> ! <antcall target="display-tolvendev-jboss-keystore" /> ! <antcall target="display-tolvendev-ldap-cacerts" /> ! <antcall target="display-tolvendev-jboss-cacerts" /> ! <antcall target="display-tolvendev-webserver-keystore" /> <echo level="info" message="All credentials have also been moved from ${tolven.stage}." /> </target> *************** *** 481,488 **** <target name="deploy-credentials" description="Initialize LDAP for Tolven"> ! <ant target="deploy-ldap-credentials" /> ! <ant target="deploy-db-credentials" /> ! <ant target="deploy-pg-client-credentials" /> ! <ant target="deploy-jboss-credentials" /> </target> --- 478,485 ---- <target name="deploy-credentials" description="Initialize LDAP for Tolven"> ! <antcall target="deploy-ldap-credentials" /> ! <antcall target="deploy-db-credentials" /> ! <antcall target="deploy-pg-client-credentials-from-stage" /> ! <antcall target="deploy-jboss-credentials" /> </target> *************** *** 491,495 **** <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${deploy-ldap-target}" /> </target> --- 488,492 ---- <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> </condition> ! <antcall target="${deploy-ldap-target}" /> </target> *************** *** 498,502 **** <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${deploy-pg-target}" /> </target> --- 495,499 ---- <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> </condition> ! <antcall target="${deploy-pg-target}" /> </target> |
|
From: Joseph I. <jos...@us...> - 2006-09-23 21:04:22
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18443 Modified Files: build.xml Log Message: All build internal calls are now called using task <antcaall>, while external build calls use <ant>. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** build.xml 23 Sep 2006 10:22:10 -0000 1.58 --- build.xml 23 Sep 2006 21:04:20 -0000 1.59 *************** *** 18,24 **** <target name="stage-init-all"> ! <ant target="stage-init" /> ! <ant target="stage-init-generate-credentials" /> ! <ant target="stage-init-merge-credentials" /> </target> --- 18,24 ---- <target name="stage-init-all"> ! <antcall target="stage-init" /> ! <antcall target="stage-init-generate-credentials" /> ! <antcall target="stage-init-merge-credentials" /> </target> *************** *** 66,70 **** <target name="stage-init-generate-credentials"> ! <ant antfile="${tolven.location}/security-config/build.xml" target="all" inheritAll="false"/> </target> --- 66,70 ---- <target name="stage-init-generate-credentials"> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="all" /> </target> *************** *** 149,157 **** </fileset> </copy> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" inheritAll="false"/> </target> <target name="deploy-db-from-stage"> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-db-credentials" inheritAll="false"/> </target> --- 149,157 ---- </fileset> </copy> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" /> </target> <target name="deploy-db-from-stage"> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-db-credentials" /> </target> *************** *** 202,210 **** </fileset> </copy> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-jboss-credentials" inheritAll="false"/> </target> <target name="deploy-pg-client-credentials-from-stage"> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-pg-client-credentials" inheritAll="false"/> </target> --- 202,210 ---- </fileset> </copy> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-jboss-credentials" /> </target> <target name="deploy-pg-client-credentials-from-stage"> ! <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-pg-client-credentials" /> </target> *************** *** 214,219 **** can be run independently--> <target name="init-external-dependencies"> ! <ant target="ldapInit" /> ! <ant target="databaseInit" /> </target> --- 214,219 ---- can be run independently--> <target name="init-external-dependencies"> ! <antcall target="ldapInit" /> ! <antcall target="databaseInit" /> </target> *************** *** 239,249 **** <target name="init" depends="clean"> <mkdir dir="build"/> ! <ant antfile="${tolvenEJB.location}/build.xml" target="init" inheritAll="false"/> ! <ant antfile="${tolvenWEB.location}/build.xml" target="init" inheritAll="false"/> </target> <target name="clean"> <delete dir="build"/> ! <ant antfile="${tolvenEJB.location}/build.xml" target="clean" inheritAll="false"/> ! <ant antfile="${tolvenWEB.location}/build.xml" target="clean" inheritAll="false"/> </target> --- 239,249 ---- <target name="init" depends="clean"> <mkdir dir="build"/> ! <ant dir="${tolvenEJB.location}" antfile="${tolvenEJB.location}/build.xml" target="init" /> ! <ant dir="${tolvenWEB.location}" antfile="${tolvenWEB.location}/build.xml" target="init" /> </target> <target name="clean"> <delete dir="build"/> ! <ant dir="${tolvenEJB.location}" antfile="${tolvenEJB.location}/build.xml" target="clean" /> ! <ant dir="${tolvenWEB.location}" antfile="${tolvenWEB.location}/build.xml" target="clean" /> </target> *************** *** 278,283 **** </target> <target depends="init" name="dependencies" description="Build dependent projects"> ! <ant antfile="${tolvenEJB.location}/build.xml" target="packaging" inheritAll="false"/> ! <ant antfile="${tolvenWEB.location}/build.xml" target="packaging" inheritAll="false"/> </target> <target name="undeploy"> --- 278,283 ---- </target> <target depends="init" name="dependencies" description="Build dependent projects"> ! <ant dir="${tolvenEJB.location}" antfile="${tolvenEJB.location}/build.xml" target="packaging" /> ! <ant dir="${tolvenWEB.location}" antfile="${tolvenWEB.location}/build.xml" target="packaging" /> </target> <target name="undeploy"> |
|
From: Joseph I. <jos...@us...> - 2006-09-23 10:22:14
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23239 Modified Files: build.xml Log Message: Renamed deploy-pg-client-credentials-from-stage to match current conventions. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** build.xml 23 Sep 2006 10:06:07 -0000 1.57 --- build.xml 23 Sep 2006 10:22:10 -0000 1.58 *************** *** 124,128 **** <antcall target="deploy-db-from-stage" /> <antcall target="deploy-jboss-from-stage" /> ! <antcall target="deploy-pg-client-credentials" /> <antcall target="clean-up-target-jboss" /> </target> --- 124,128 ---- <antcall target="deploy-db-from-stage" /> <antcall target="deploy-jboss-from-stage" /> ! <antcall target="deploy-pg-client-credentials-from-stage" /> <antcall target="clean-up-target-jboss" /> </target> *************** *** 205,209 **** </target> ! <target name="deploy-pg-client-credentials"> <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-pg-client-credentials" inheritAll="false"/> </target> --- 205,209 ---- </target> ! <target name="deploy-pg-client-credentials-from-stage"> <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-pg-client-credentials" inheritAll="false"/> </target> |
|
From: Joseph I. <jos...@us...> - 2006-09-23 10:06:13
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18423 Modified Files: build.xml Log Message: Split the deploy-from-stage target into separate targets: deploy-ldap-from-stage, deploy-db-from-stage, deploy-jboss-from-stage and deploy-pg-client-from-stage. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** build.xml 5 Sep 2006 08:03:01 -0000 1.56 --- build.xml 23 Sep 2006 10:06:07 -0000 1.57 *************** *** 121,130 **** <target name="deploy-from-stage"> <mkdir dir="${ldap.location}/tolvendata"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="tolveninitial.ldif"/> </fileset> </copy> <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar"> --- 121,160 ---- <target name="deploy-from-stage"> + <antcall target="deploy-ldap-from-stage" /> + <antcall target="deploy-db-from-stage" /> + <antcall target="deploy-jboss-from-stage" /> + <antcall target="deploy-pg-client-credentials" /> + <antcall target="clean-up-target-jboss" /> + </target> + + <!-- Note the following target will be removed, when the removal of these files is incorporated into the zipped tolven-jboss --> + <target name="clean-up-target-jboss"> + <delete> + <fileset dir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs"> + <include name="myfaces-api.jar"/> + <include name="myfaces-impl.jar"/> + </fileset> + </delete> + </target> + + <target name="deploy-ldap-from-stage"> <mkdir dir="${ldap.location}/tolvendata"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> + <include name="tolvendev-ldap-cert.pem" /> + <include name="tolvendev-ldap-key.pem" /> + <include name="tolvendev-ldap-cacerts.pem" /> + <include name="slapd.conf"/> <include name="tolveninitial.ldif"/> </fileset> </copy> + <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" inheritAll="false"/> + </target> + + <target name="deploy-db-from-stage"> + <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-db-credentials" inheritAll="false"/> + </target> + + <target name="deploy-jboss-from-stage"> <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar"> *************** *** 150,164 **** </fileset> </copy> - - <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> - <fileset dir="${tolven.stage}/ldap-deploy-location"> - <include name="tolvendev-ldap-cert.pem" /> - <include name="tolvendev-ldap-key.pem" /> - <include name="tolvendev-ldap-cacerts.pem" /> - <include name="slapd.conf"/> - <include name="tolveninitial.ldif"/> - </fileset> - </copy> - <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/conf"> --- 180,183 ---- *************** *** 183,193 **** </fileset> </copy> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-credentials" inheritAll="false"/> ! <delete> ! <fileset dir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs"> ! <include name="myfaces-api.jar"/> ! <include name="myfaces-impl.jar"/> ! </fileset> ! </delete> </target> --- 202,210 ---- </fileset> </copy> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-jboss-credentials" inheritAll="false"/> ! </target> ! ! <target name="deploy-pg-client-credentials"> ! <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-pg-client-credentials" inheritAll="false"/> </target> |
|
From: Joseph I. <jos...@us...> - 2006-09-23 05:03:35
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25709/security-config Modified Files: build.xml Log Message: If: tolven.stage.use-existing-pg-client-cert=true the client cert located in the user's home directory will have jboss cert added to it, if it exists or it will be created. If: tolven.stage.use-existing-pg-client-cert=false a new client cert will be created and deployed whenever a user selects those functions, whether a client cert exists or not. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** build.xml 18 Sep 2006 07:38:34 -0000 1.41 --- build.xml 23 Sep 2006 05:03:33 -0000 1.42 *************** *** 184,188 **** </condition> <condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore"> ! <equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" /> </condition> <ant target="${db-client-target}" /> --- 184,191 ---- </condition> <condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore"> ! <and> ! <equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" /> ! <available file="${postgres-client-cert-dir}/postgresql.crt" /> ! </and> </condition> <ant target="${db-client-target}" /> |
|
From: John C. <jc...@us...> - 2006-09-18 16:08:17
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29876/src/org/tolven/core/bean Modified Files: InvitationBean.java Log Message: Adding comments Index: InvitationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/InvitationBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** InvitationBean.java 3 Sep 2006 01:13:16 -0000 1.10 --- InvitationBean.java 18 Sep 2006 16:08:12 -0000 1.11 *************** *** 144,147 **** --- 144,155 ---- } + /** + * Return a list of all active invitations. + * @return + */ + public List<Invitation> activeInvitations( ) { + return null; + } + public void invitationQueueTest( int count ) throws JMSException { Connection connection = connectionFactory.createConnection(); |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:29
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/src/org/tolven/web/ccr Added Files: StringListConverter.java Log Message: Initial Wizard work --- NEW FILE: StringListConverter.java --- package org.tolven.web.ccr; import java.util.ArrayList; import java.util.List; import javax.el.ELContext; import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; /** * Faces converter between a string and an array of string. * @author John Churin * */ public class StringListConverter implements Converter { /** * Parse a string and return an array of strings for each space-delimited segment of the string * (non-Javadoc) * @see javax.faces.convert.Converter#getAsObject(javax.faces.context.FacesContext, javax.faces.component.UIComponent, java.lang.String) */ public Object getAsObject(FacesContext ctx, UIComponent comp, String name) throws ConverterException { List<String> components = new ArrayList<String>(); String n[] = name.trim().split("\\s"); for ( String s : n) { if (s!=null) { String st = s.trim(); if (st.length()>0) components.add(s); } } // System.out.println( "[stringListConverter] to object: " + components); return components; } /** * Combine name segments with a space between them */ public String getAsString(FacesContext ctx, UIComponent comp, Object name) throws ConverterException { if (name==null) return ""; List<String> components = (List<String>)name; StringBuffer sb = new StringBuffer( 100 ); for (String s : components) { sb.append(s); sb.append(" "); } // System.out.println( "[stringListConverter], to string: " + sb.toString()); return sb.toString(); } } |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:29
|
Update of /cvsroot/tolven/tolvenWEB/web/META-INF/tags/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/web/META-INF/tags/ccr Added Files: PersonNameType.xhtml actorTypePerson.xhtml actorType.xhtml Log Message: Initial Wizard work --- NEW FILE: actorTypePerson.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ccr="http://www.tolven.org/jsf/ccr" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>actorTypePerson</title> </head> <body> <ui:component> <h:outputText value="actorTypePerson" rendered="#{ccr.debug}"/><br/> <h:panelGrid columns="1"> <ccr:name id="cn" name="#{person.name.currentName}" description="Current name" parent="#{person.name}" /> <ccr:name id="bn" name="#{person.name.birthName}" description="Birth name" parent="#{person.name}"/> </h:panelGrid> </ui:component> </body> </html> --- NEW FILE: actorType.xhtml --- --- NEW FILE: PersonNameType.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ccr="http://www.tolven.org/jsf/ccr" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>Hi</title> </head> <body> <ui:component > <f:subview id="#{id}" > <h:commandLink action="#{ccr.add}" rendered="#{name==null}"> <h:outputText value="Add #{description}"/> <f:param name="parent" value="#{parent}"/> <f:param name="type" value="org.tolven.ccr.PersonNameType"/> </h:commandLink> <h:panelGroup rendered="#{name!=null}"> <f:subview id="i" > <h:outputText value="#{description}"/> <h:panelGrid columns="2"> <h:outputText value="Given"/> <h:inputText id="given" value="#{name.given}" converter="stringListConverter"/> <h:outputText value="Middle"/> <h:inputText id="middle" value="#{name.middle}" converter="stringListConverter"/> <h:outputText value="Family"/> <h:inputText id="family" value="#{name.family}" converter="stringListConverter"/> <h:outputText value="Suffix"/> <h:inputText id="suffix" value="#{name.suffix}" converter="stringListConverter" size="10"/> <h:outputText value="Title"/> <h:inputText id="title" value="#{name.title}" converter="stringListConverter" size="10"/> <h:outputText value="NickName"/> <h:inputText id="nickName" value="#{name.nickName}" converter="stringListConverter"/> </h:panelGrid> </f:subview> <f:subview id="o"> <h:panelGroup rendered="#{not empty name.given}"> <h:outputText value="Given: "/> <h:outputText id="given" value="#{name.given}" converter="stringListConverter"/> </h:panelGroup> <h:panelGroup rendered="#{not empty name.middle}"> <h:outputText value="Middle: "/> <h:outputText id="middle" value="#{name.middle}" converter="stringListConverter"/> </h:panelGroup> <h:panelGroup rendered="#{not empty name.family}"> <h:outputText value="Family: "/> <h:outputText id="family" value="#{name.family}" converter="stringListConverter"/> </h:panelGroup> <h:panelGroup rendered="#{not empty name.suffix}"> <h:outputText value="Suffix: "/> <h:outputText id="suffix" value="#{name.suffix}" converter="stringListConverter" /> </h:panelGroup> <h:panelGroup rendered="#{not empty name.title}"> <h:outputText value="Title: "/> <h:outputText id="title" value="#{name.title}" converter="stringListConverter"/> </h:panelGroup> <h:panelGroup rendered="#{not empty name.nickName}"> <h:outputText value="NickName: "/> <h:outputText id="nickName" value="#{name.nickName}" converter="stringListConverter"/> </h:panelGroup> </f:subview> </h:panelGroup> </f:subview> </ui:component> </body> </html> |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:26
|
Update of /cvsroot/tolven/tolvenWEB/web/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/web/ccr Added Files: ccrtest.xhtml Log Message: Initial Wizard work --- NEW FILE: ccrtest.xhtml --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ccr="http://www.tolven.org/jsf/ccr" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> <head> <title>CCR Template Test</title> </head> <body> <f:view> <h:form id="ccr"> <ccr:person person="#{ccr.actor.person}"/> <h:selectBooleanCheckbox id="debugFlag" value="#{ccr.debug}"/> <h:outputLabel for="debugFlag" value="Show Debug"/> <h:commandButton value="Reset" immediate="true" action="#{ccr.reset}"/> <h:commandButton value="Submit" action="#{ccr.submit}"/> </h:form> </f:view> </body> </html> |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:26
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/web/WEB-INF Modified Files: web.xml faces-config.xml Log Message: Initial Wizard work Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** faces-config.xml 3 Sep 2006 07:06:15 -0000 1.15 --- faces-config.xml 18 Sep 2006 16:06:23 -0000 1.16 *************** *** 20,23 **** --- 20,30 ---- <converter-class>org.tolven.web.AgeConverter</converter-class> </converter> + <converter> + <description> + Convert between a string and a List of Strings + </description> + <converter-id>stringListConverter</converter-id> + <converter-class>org.tolven.web.ccr.StringListConverter</converter-class> + </converter> <navigation-rule> *************** *** 449,452 **** --- 456,464 ---- <to-view-id>/five/labGraph.xhtml</to-view-id> </navigation-case> + <navigation-case> + <from-action>#{doc.evaluatePath}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/five//test/docDetail.xhtml</to-view-id> + </navigation-case> </navigation-rule> *************** *** 479,482 **** --- 491,530 ---- </navigation-rule> + <navigation-rule> + <description> + CCR Test + </description> + <from-view-id>/ccr/ccrtest.xhtml</from-view-id> + <navigation-case> + <from-action>#{ccr.reset}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/ccr/ccrtest.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-action>#{ccr.tog}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/ccr/ccrtest.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-action>#{ccr.submit}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/ccr/ccrtest.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-action>#{ccr.add}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/ccr/ccrtest.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + + <managed-bean> + <description> + TEMPORARY FOR TESTING CCR + </description> + <managed-bean-name>ccr</managed-bean-name> + <managed-bean-class>org.tolven.web.CCRAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> <description> Index: web.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/web.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** web.xml 3 Sep 2006 07:06:15 -0000 1.8 --- web.xml 18 Sep 2006 16:06:23 -0000 1.9 *************** *** 22,25 **** --- 22,29 ---- </context-param> <context-param> + <param-name>facelets.LIBRARIES</param-name> + <param-value>/META-INF/tags/ccr.taglib.xml</param-value> + </context-param> + <context-param> <param-name>facelets.REFRESH_PERIOD</param-name> <param-value>2</param-value> |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:26
|
Update of /cvsroot/tolven/tolvenWEB/web/styles In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/web/styles Added Files: wizard.css Log Message: Initial Wizard work --- NEW FILE: wizard.css --- .wizard { BORDER-RIGHT: #333333 2px solid; PADDING-RIGHT: 0px; BORDER-TOP: #333333 2px solid; DISPLAY: block; PADDING-LEFT: 0px; BACKGROUND: #ffffff; PADDING-BOTTOM: 0px; MARGIN: 20px; BORDER-LEFT: #333333 2px solid; PADDING-TOP: 0px; BORDER-BOTTOM: #333333 2px solid; FONT-FAMILY: 'Lucide Grande', Verdana, Arial, sans-serif } FORM { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px } .titlebar { PADDING-RIGHT: 6px; PADDING-LEFT: 10px; BACKGROUND: url(../images/bkgd_wizardtitle.jpg) #333333 repeat-x left center; PADDING-BOTTOM: 4px; MARGIN: 0px; COLOR: #ffffff; PADDING-TOP: 4px; BORDER-BOTTOM: #333333 1px solid } .titlebar TABLE { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; WIDTH: 100%; PADDING-TOP: 0px; BORDER-COLLAPSE: collapse } .titlebar TD.closewindow { VERTICAL-ALIGN: middle; TEXT-ALIGN: right } .titlebar H1 { PADDING-RIGHT: 6px; PADDING-LEFT: 6px; FONT-WEIGHT: normal; FONT-SIZE: 1em; PADDING-BOTTOM: 3px; MARGIN: 0px; PADDING-TOP: 3px } .wizard IMG { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; BORDER-BOTTOM-STYLE: none } .infobar { PADDING-RIGHT: 10px; PADDING-LEFT: 10px; BACKGROUND: #e6e6e6; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BORDER-BOTTOM: #666666 1px solid } .infobar TABLE { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; WIDTH: 100%; PADDING-TOP: 0px; BORDER-COLLAPSE: collapse } .infobar H1 { PADDING-RIGHT: 0em; PADDING-LEFT: 0em; FONT-SIZE: 1.25em; PADDING-BOTTOM: 0em; PADDING-TOP: 0em } .infobar P { } .steps { PADDING-RIGHT: 10px; PADDING-LEFT: 10px; BACKGROUND: #99ccff; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BORDER-BOTTOM: #6896c5 1px solid } .steps TABLE { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; WIDTH: 100%; PADDING-TOP: 0px; BORDER-COLLAPSE: collapse } .steps H2 { PADDING-RIGHT: 50px; DISPLAY: inline; PADDING-LEFT: 0px; FONT-WEIGHT: normal; FONT-SIZE: 1.1em; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px } .steps UL { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px } .steps LI { PADDING-RIGHT: 0px; DISPLAY: block; PADDING-LEFT: 0px; BACKGROUND: url(../images/bkgd_step.jpg) no-repeat center center; FLOAT: left; LIST-STYLE-IMAGE: url(none); PADDING-BOTTOM: 8px; MARGIN: 0px 6px 0px 0px; WIDTH: 36px; COLOR: #003399; PADDING-TOP: 12px; LIST-STYLE-TYPE: none; HEIGHT: 20px; TEXT-ALIGN: center } .steps .active { FONT-WEIGHT: bold; BACKGROUND: url(../images/bkgd_stepactive.jpg) no-repeat center center; COLOR: #ffffff } .navbar { PADDING-RIGHT: 10px; BORDER-TOP: #999999 1px solid; PADDING-LEFT: 10px; BACKGROUND: url(../images/bkgd_navbar.jpg) #f1f1f1 repeat-y center top; PADDING-BOTTOM: 10px; MARGIN: 0px; PADDING-TOP: 10px } .navbar TABLE { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; WIDTH: 100%; PADDING-TOP: 0px; BORDER-COLLAPSE: collapse } .navbar TD { TEXT-ALIGN: center } .navbar INPUT { MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px } .wizard .page { PADDING-RIGHT: 10px; PADDING-LEFT: 10px; PADDING-BOTTOM: 10px; PADDING-TOP: 10px } .wizard .pagesm { PADDING-RIGHT: 10px; PADDING-LEFT: 10px; FLOAT: left; PADDING-BOTTOM: 10px; WIDTH: 50%; PADDING-TOP: 10px } .help { BORDER-RIGHT: #6600ff 2px solid; PADDING-RIGHT: 10px; BORDER-TOP: #6600ff 2px solid; PADDING-LEFT: 10px; BACKGROUND: url(../images/bkgd_helpbox.jpg) #f0f0ff repeat-x left bottom; FLOAT: right; PADDING-BOTTOM: 10px; MARGIN: 10px; BORDER-LEFT: #6600ff 2px solid; WIDTH: 30%; COLOR: #333333; PADDING-TOP: 10px; BORDER-BOTTOM: #6600ff 2px solid } .help H1 { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-SIZE: 1em; BACKGROUND: url(../images/btn_closehelp.jpg) no-repeat right center; PADDING-BOTTOM: 4px; MARGIN: 0px; PADDING-TOP: 0px; BORDER-BOTTOM: #333333 1px solid } .help P { MARGIN: 0.25em 0px; LINE-HEIGHT: 1.3em } .help STRONG { COLOR: #534095 } .add { BORDER-RIGHT: #999900 1px solid; PADDING-RIGHT: 0px; BORDER-TOP: #999900 1px solid; PADDING-LEFT: 0px; BACKGROUND: #ffffee; PADDING-BOTTOM: 0px; MARGIN: 0px; BORDER-LEFT: #999900 1px solid; PADDING-TOP: 0px; BORDER-BOTTOM: #999900 1px solid } .add LEGEND { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 1.2em; PADDING-BOTTOM: 0px; MARGIN: 0px; COLOR: #333333; PADDING-TOP: 10px } TD { VERTICAL-ALIGN: middle } .alignright { TEXT-ALIGN: right } P { PADDING-BOTTOM: 0.5em; PADDING-TOP: 0.5em } UNKNOWN { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 1.2em; BACKGROUND: url(../images/btn_stop.gif) no-repeat center center; PADDING-BOTTOM: 4px; MARGIN: 0px 10px; WIDTH: 92px; COLOR: #333333; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; HEIGHT: 34px; BORDER-BOTTOM-STYLE: none } UNKNOWN { PADDING-RIGHT: 10px; PADDING-LEFT: 0px; FONT-WEIGHT: bold; FONT-SIZE: 1.2em; BACKGROUND: url(../images/btn_next.gif) no-repeat center center; PADDING-BOTTOM: 4px; MARGIN: 0px 10px; WIDTH: 112px; COLOR: #333333; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; HEIGHT: 34px; BORDER-BOTTOM-STYLE: none } UNKNOWN { PADDING-RIGHT: 0px; PADDING-LEFT: 15px; FONT-WEIGHT: bold; FONT-SIZE: 1.2em; BACKGROUND: url(../images/btn_prev.gif) no-repeat center center; PADDING-BOTTOM: 4px; MARGIN: 0px 10px; WIDTH: 112px; COLOR: #333333; BORDER-TOP-STYLE: none; PADDING-TOP: 0px; BORDER-RIGHT-STYLE: none; BORDER-LEFT-STYLE: none; HEIGHT: 34px; BORDER-BOTTOM-STYLE: none } UNKNOWN { BACKGROUND: url(../images/btn_stop_fade.gif) no-repeat center center; COLOR: #818181 } UNKNOWN { BACKGROUND: url(../images/btn_next_fade.gif) no-repeat center center; COLOR: #818181 } UNKNOWN { BACKGROUND: url(../images/btn_prev_fade.gif) no-repeat center center; COLOR: #818181 } |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:26
|
Update of /cvsroot/tolven/tolvenWEB/web/META-INF/tags In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/web/META-INF/tags Added Files: ccr.taglib.xml Log Message: Initial Wizard work --- NEW FILE: ccr.taglib.xml --- <?xml version="1.0"?> <!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "http://java.sun.com/dtd/faclet-taglib_1_0.dtd"> <facelet-taglib> <namespace>http://www.tolven.org/jsf/ccr</namespace> <tag> <tag-name>actor</tag-name> <source>ccr/actorType.xhtml</source> </tag> <tag> <tag-name>person</tag-name> <source>ccr/actorTypePerson.xhtml</source> </tag> <tag> <tag-name>name</tag-name> <source>ccr/PersonNameType.xhtml</source> </tag> </facelet-taglib> |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:26
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29053/src/org/tolven/web Added Files: CCRAction.java Log Message: Initial Wizard work --- NEW FILE: CCRAction.java --- package org.tolven.web; import java.util.List; import javax.faces.context.FacesContext; import org.tolven.ccr.ActorType; import org.tolven.ccr.PersonNameType; public class CCRAction extends TolvenAction { private ActorType actor; private boolean debug; /** * USING THIS CLASS FOR TEST ONLY --- * @return */ public ActorType getActor() { if (actor==null) { actor = new ActorType(); ActorType.Person person = new ActorType.Person(); PersonNameType personName = new PersonNameType(); personName.getGiven().add("a given name 3"); ActorType.Person.Name name = new ActorType.Person.Name(); name.setCurrentName(personName); person.setName(name); actor.setPerson(person); } return actor; } public void setActor(ActorType actor) { this.actor = actor; } public String submit() { System.out.println( "CCR Submit " ); ActorType actor = getActor(); if (actor==null) return "success"; ActorType.Person person = actor.getPerson(); if (person==null) return "success"; ActorType.Person.Name name = person.getName(); if (name==null) return "success"; PersonNameType pnt = name.getCurrentName(); if (pnt==null) return "success"; System.out.println( "PersonNameType: " + pnt.getFamily() + "," + pnt.getGiven() ); return "success"; } public String reset() { System.out.println( "CCR Reset " ); actor = null; return "success"; } public String add() { Object type = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("type"); Object parent = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("parent"); System.out.println( "Add a " + type + " to " + parent ); // if (parent instanceof ActorType.Person.Name) { ActorType.Person.Name lp = (ActorType.Person.Name)parent; lp.setBirthName(new PersonNameType ()); System.out.println( "Added birth Name"); // } return "success"; } public boolean isDebug() { return debug; } public void setDebug(boolean debug) { this.debug = debug; } } |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/web/META-INF/tags/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/web/META-INF/tags/ccr Log Message: Directory /cvsroot/tolven/tolvenWEB/web/META-INF/tags/ccr added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/web/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/web/ccr Log Message: Directory /cvsroot/tolven/tolvenWEB/web/ccr added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/web/META-INF/tags In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/web/META-INF/tags Log Message: Directory /cvsroot/tolven/tolvenWEB/web/META-INF/tags added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/web/wizard In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/web/wizard Log Message: Directory /cvsroot/tolven/tolvenWEB/web/wizard added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/web/META-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/web/META-INF Log Message: Directory /cvsroot/tolven/tolvenWEB/web/META-INF added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 16:06:20
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/ccr In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29014/src/org/tolven/web/ccr Log Message: Directory /cvsroot/tolven/tolvenWEB/src/org/tolven/web/ccr added to the repository |
|
From: John C. <jc...@us...> - 2006-09-18 15:52:18
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23240/src/org/tolven/gen/bean Modified Files: CHRGeneratorBean.java Log Message: Document must be created winhin an account Index: CHRGeneratorBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/CHRGeneratorBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CHRGeneratorBean.java 28 Aug 2006 19:37:36 -0000 1.6 --- CHRGeneratorBean.java 18 Sep 2006 15:52:13 -0000 1.7 *************** *** 215,219 **** // Create the CCR document describing the patient. ! DocCCR ccr = documentLocal.createCCRDocument(user.getId()); ActorType pat = ccr.addNewPatient(); ActorType.Person person = new ActorType.Person(); --- 215,219 ---- // Create the CCR document describing the patient. ! DocCCR ccr = documentLocal.createCCRDocument(user.getId(), account.getId()); ActorType pat = ccr.addNewPatient(); ActorType.Person person = new ActorType.Person(); |
|
From: John C. <jc...@us...> - 2006-09-18 15:51:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22824/src/org/tolven/gen/bean Modified Files: PersonGeneratorDAO.java Log Message: Autobox cleanup Index: PersonGeneratorDAO.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/bean/PersonGeneratorDAO.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PersonGeneratorDAO.java 21 Aug 2006 00:26:29 -0000 1.6 --- PersonGeneratorDAO.java 18 Sep 2006 15:51:33 -0000 1.7 *************** *** 169,173 **** Query query = em.createQuery( "SELECT COUNT(c) FROM VirtualPerson c"); Long rslt = (Long) query.getSingleResult(); ! return rslt.longValue(); } --- 169,173 ---- Query query = em.createQuery( "SELECT COUNT(c) FROM VirtualPerson c"); Long rslt = (Long) query.getSingleResult(); ! return rslt; } *************** *** 178,182 **** Query query = em.createQuery( "SELECT COUNT(f) FROM FamilyUnit f"); Long rslt = (Long) query.getSingleResult(); ! return rslt.longValue(); } --- 178,182 ---- Query query = em.createQuery( "SELECT COUNT(f) FROM FamilyUnit f"); Long rslt = (Long) query.getSingleResult(); ! return rslt; } |
|
From: John C. <jc...@us...> - 2006-09-18 15:50:34
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22418/src/org/tolven/doc Modified Files: DocumentLocal.java Log Message: Add methods to get list of documents for an account Index: DocumentLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/DocumentLocal.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DocumentLocal.java 31 Aug 2006 05:18:28 -0000 1.5 --- DocumentLocal.java 18 Sep 2006 15:50:29 -0000 1.6 *************** *** 29,32 **** --- 29,33 ---- import org.tolven.doc.entity.DocCCR; import org.tolven.doc.entity.DocImage; + import org.tolven.doc.entity.DocXML; *************** *** 54,62 **** * to create actual CCR object graph. * @param userId * @return * @throws IOException * @throws CCRException */ ! public DocCCR createCCRDocument( long userId ) throws IOException, CCRException; /** --- 55,64 ---- * to create actual CCR object graph. * @param userId + * @param accountId * @return * @throws IOException * @throws CCRException */ ! public DocCCR createCCRDocument( long userId, long accountId ) throws IOException, CCRException; /** *************** *** 79,82 **** --- 81,88 ---- public DocBase findDocument( long docId ); + /** + * Return XML documents for the specified account + */ + public List<DocXML> findXMLDocuments(long accountId, int pageSize, int offset, String sortAttribute, String sortDir ); /** |
|
From: John C. <jc...@us...> - 2006-09-18 15:43:51
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19305/src/org/tolven/ajax Modified Files: AjaxServlet.java Log Message: Add debug menu to demo tab that displays contents of documents Index: AjaxServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AjaxServlet.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** AjaxServlet.java 31 Aug 2006 06:49:52 -0000 1.13 --- AjaxServlet.java 18 Sep 2006 15:43:15 -0000 1.14 *************** *** 50,53 **** --- 50,54 ---- import org.tolven.doc.entity.DocBase; import org.tolven.doc.entity.DocImage; + import org.tolven.doc.entity.DocXML; import org.tolven.gen.PersonGenerator; import org.tolven.gen.entity.FamilyUnit; *************** *** 303,306 **** --- 304,324 ---- } + if (uri.endsWith("activeInvitations.ajax")) { + String sortAttribute = "id"; + if ("name".equals(sortCol)) { + sortAttribute="familyName"; + } + String nameFilter = req.getParameter( "nameFilter"); + List<FamilyUnit> rows = personDAO.findFamilies(pageSize, offset, sortAttribute, sortDir, nameFilter ); + int line = 0; + for (FamilyUnit p : rows) { + line++; + writer.write( "<tr>" ); + writer.write( "<td> " + p.getId() + "</td>"); + writer.write( "<td> <a href=\"#\" onclick=\"showPane(containerId(this)+':detail-" + p.getId()+ "')\">"+ p.getFamilyName() + "</a></td>"); + writer.write( "</tr>\n"); + } + } + if (uri.endsWith("familyList.ajax")) { String sortAttribute = "id"; *************** *** 350,353 **** --- 368,388 ---- } } + if (uri.endsWith("xmlDocList.ajax")) { + String sortAttribute = "id"; + long accountId = (Long) req.getSession(false).getAttribute("accountId"); + List<DocXML> rows = documentLocal.findXMLDocuments(accountId, pageSize, offset, sortAttribute, sortDir ); + int line = 0; + for (DocXML d : rows) { + line++; + writer.write( "<tr>" ); + writer.write( "<td> <a href=\"#\" onclick=\"showPane(containerId(this)+':detail-" + d.getId()+ "')\">"+ d.getId() + "</a> </td>"); + // writer.write( "<td> " + d.getId() + "</td>"); + writer.write( "<td> " + d.getBindingContext() + "</td>"); + writer.write( "<td> " + d.getAuthor().getLdapUID() + "</td>"); + writer.write( "<td> " + d.getStatus() + "</td>"); + + writer.write( "</tr>\n"); + } + } if (uri.endsWith("conceptList.ajax")) { String sortAttribute = "cui"; *************** *** 377,381 **** line++; writer.write( "<tr>" ); ! writer.write( "<td class=\"col1\"> <a href=\"#\" onclick=\"showPane( 'echr:test:photos:photoDetail-" + d.getId()+ "')\">"+ d.getId() + "</a></td>"); writer.write( "<td class=\"col2\"> " + d.getMediaType()+ "</td>"); writer.write( "</tr>\n"); --- 412,416 ---- line++; writer.write( "<tr>" ); ! writer.write( "<td class=\"col1\"> <a href=\"#\" onclick=\"showPane( 'echr:test:photos:detail-" + d.getId()+ "')\">"+ d.getId() + "</a></td>"); writer.write( "<td class=\"col2\"> " + d.getMediaType()+ "</td>"); writer.write( "</tr>\n"); *************** *** 387,391 **** mrconsoLoader.load(Long.parseLong(id)); } ! if (uri.endsWith("loaderControl.ajax")) { List<LoaderControl> rows = mrconsoLoader.findLoaderControls(pageSize, offset ); int line = 0; --- 422,427 ---- mrconsoLoader.load(Long.parseLong(id)); } ! ! if (uri.endsWith("loaderControl.ajax")) { List<LoaderControl> rows = mrconsoLoader.findLoaderControls(pageSize, offset ); int line = 0; |
|
From: John C. <jc...@us...> - 2006-09-18 15:43:21
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19305/src/org/tolven/web Modified Files: DocAction.java Log Message: Add debug menu to demo tab that displays contents of documents Index: DocAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/DocAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DocAction.java 31 Aug 2006 05:20:09 -0000 1.6 --- DocAction.java 18 Sep 2006 15:43:15 -0000 1.7 *************** *** 17,27 **** --- 17,33 ---- import java.util.Map; + import javax.faces.application.Application; import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; + import javax.xml.bind.JAXBException; + import org.tolven.app.entity.MenuData; + import org.tolven.ccr.ContinuityOfCareRecord; import org.tolven.doc.DocumentLocal; import org.tolven.doc.entity.DocBase; + import org.tolven.doc.entity.DocCCR; import org.tolven.doc.entity.DocImage; + import org.tolven.doc.entity.DocXML; /** *************** *** 31,34 **** --- 37,44 ---- public class DocAction extends TolvenAction { + private long documentId = 0; + private String path; + private String pathValue; + private String elapsedTime = null; private String content; *************** *** 61,72 **** } ! public long getCurrentDocId( ) { ! Map<String,Object> reqMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap(); ! MenuAction menuAction = (MenuAction) reqMap.get( "menu"); ! if (menuAction==null) menuAction = new MenuAction(); ! Map<String, Long> keys = menuAction.getTargetMenuPath().getNodeValues(); ! long id = keys.get("photoDetail"); ! return id; } --- 71,109 ---- } + public DocXML getDocXML( ) throws Exception { + DocBase doc = docBean.findDocument(getCurrentDocId()); + System.out.println( "[getDocXML] id=" + getCurrentDocId()); + if (doc==null) { + System.out.println( "No Document Found"); + return null; + } + // Has to be for this account or it's not found. + if (this.getTop().getAccountId()!=doc.getAccount().getId()) { + System.out.println( "Document owned by this account"); + return null; + } + if (!(doc instanceof DocXML)) { + System.out.println( "Document is not CCR " + doc.getId() + " Class: " + doc.getClass().getName()); + return null; + } + return (DocXML) doc; + } ! public ContinuityOfCareRecord getccr() throws JAXBException, Exception { ! if (getDocXML()==null) return null; ! if (!(getDocXML() instanceof DocCCR)) return null; ! DocCCR ccr = (DocCCR) getDocXML(); ! return (ContinuityOfCareRecord) ccr.getBinding(); ! } ! ! public long getCurrentDocId( ) { ! if (documentId==00) { ! Map<String,Object> reqMap = FacesContext.getCurrentInstance().getExternalContext().getRequestMap(); ! MenuAction menuAction = (MenuAction) reqMap.get( "menu"); ! if (menuAction==null) menuAction = new MenuAction(); ! Map<String, Long> keys = menuAction.getTargetMenuPath().getNodeValues(); ! documentId = keys.get("detail"); ! } ! return documentId; } *************** *** 137,139 **** --- 174,211 ---- } + /** + * Evaluate a path expression against the currently selected document, if present. + * @return + * @throws Exception + */ + public String evaluatePath( ) throws Exception { + DocXML doc = getDocXML( ); + if (doc != null) { + FacesContext ctx = FacesContext.getCurrentInstance(); + Application app = ctx.getApplication(); + setPathValue((String) app.evaluateExpressionGet(ctx, getPath(), String.class )); + } + return "success"; + } + + public String getPath() { + if (path==null) { + path = "#{doc.ccr.actors.actor[0].address[0].line1}"; + } + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public String getPathValue() { + return pathValue; + } + + public void setPathValue(String pathValue) { + this.pathValue = pathValue; + } + + } |
3 messages has been excluded from this view by a project administrator.
