Menu
▾
▴
tolven-cvs-commit — Tolven CVS Commit
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(141) |
Sep
(184) |
Oct
(159) |
Nov
(77) |
Dec
(114) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(212) |
Feb
(302) |
Mar
(323) |
Apr
(360) |
May
(302) |
Jun
(392) |
Jul
(299) |
Aug
(858) |
Sep
(499) |
Oct
(489) |
Nov
(324) |
Dec
(438) |
| 2008 |
Jan
(449) |
Feb
(388) |
Mar
(811) |
Apr
(583) |
May
(949) |
Jun
(1431) |
Jul
(943) |
Aug
(527) |
Sep
(576) |
Oct
(440) |
Nov
(1046) |
Dec
(658) |
| 2009 |
Jan
(259) |
Feb
(192) |
Mar
(495) |
Apr
(2322) |
May
(2023) |
Jun
(1387) |
Jul
(722) |
Aug
(771) |
Sep
(167) |
Oct
(142) |
Nov
(384) |
Dec
(884) |
| 2010 |
Jan
(344) |
Feb
(82) |
Mar
(248) |
Apr
(341) |
May
(389) |
Jun
(289) |
Jul
(19) |
Aug
(478) |
Sep
(274) |
Oct
(431) |
Nov
(322) |
Dec
(207) |
| 2011 |
Jan
(125) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John C. <jc...@us...> - 2007-01-28 06:03:55
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30436/src/org/tolven/core Added Files: AccountDAORemote.java ActivationRemote.java Log Message: Add remote interfaces to some existing session beans. --- NEW FILE: AccountDAORemote.java --- package org.tolven.core; import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountType; public interface AccountDAORemote { /** * Find an account given the account id. * @param accountId * @return the account object */ public Account findAccount(long accountId ); /** * Find an accountType by id * @return AccountType */ public AccountType findAccountType( long id ); } --- NEW FILE: ActivationRemote.java --- package org.tolven.core; import org.tolven.core.entity.TolvenUser; public interface ActivationRemote { /** * Given the principal's name, get the TolvenUser. */ public TolvenUser findUser( String principal ); } |
|
From: John C. <jc...@us...> - 2007-01-28 05:52:02
|
Update of /cvsroot/tolven/tolvenClient In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25323 Added Files: .classpath readme.txt tolven.auth .project jndi.properties Log Message: New test client --- NEW FILE: .project --- <?xml version="1.0" encoding="UTF-8"?> <projectDescription> <name>tolvenClient</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> --- NEW FILE: jndi.properties --- java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory java.naming.provider.url=jnp://localhost:1099 java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces --- NEW FILE: .classpath --- <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="E:/tolvenWS/tolvenEJB/build/tolvenEJB.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/xmlsec.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/activation.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/avalon-framework.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/commons-httpclient.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/commons-logging.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/concurrent.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/ejb3-persistence.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/getopt.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/hibernate-annotations.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/hibernate-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jacorb.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/javassist.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/javax.servlet.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossall-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-annotations-ejb3.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-aop-jdk50-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-aspect-jdk50-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-common-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbosscx-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-deployment.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-ejb3-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-ejb3x.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossha-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-iiop-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-j2ee.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-jaxrpc.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossjmx-ant.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-jsr77-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossmq-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-remoting.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-saaj.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-serialization.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-srp-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbosssx-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-system-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-transaction-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jbossws-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jmx-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jmx-invoker-adaptor-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/jnp-client.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/juddisaaj.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/log4j.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/logkit.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/mail.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/scout.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/trove.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/client/wsdl4j.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/hibernate3.jar"/> <classpathentry kind="lib" path="F:/tolven-alpha4/tolven-jboss-4.0.4.GA/server/tolven/lib/cglib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> --- NEW FILE: readme.txt --- This tolven client project must link with: everything in /tolven-jboss-4.0.4.GA/client tolvenEJB/build/tolvenEJB.jar tolven-jboss-4.0.4.GA/server/tolven/lib/hibernate3.jar* tolven-jboss-4.0.4.GA/server/tolven/lib/gclib.jar* *temporary due to a bug in JBoss 4.0.4 jndi.properties and tolven.auth files must be available on the classpath and may need to be changed depending on your configuration. For example, in jndi the server is assumed to be on localhost. Username, password, and account are hard coded in Test1.java. John. --- NEW FILE: tolven.auth --- tolvenLDAP { org.jboss.security.ClientLoginModule required; }; |
|
From: John C. <jc...@us...> - 2007-01-28 05:52:02
|
Update of /cvsroot/tolven/tolvenClient/src/org/tolven/client In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25323/src/org/tolven/client Added Files: Test1.java Log Message: New test client --- NEW FILE: Test1.java --- package org.tolven.client; import java.io.IOException; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import javax.servlet.http.HttpSession; import org.tolven.core.AccountDAORemote; import org.tolven.core.ActivationRemote; import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountType; import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentRemote; import org.tolven.doc.entity.DocBase; public class Test1 { public static final long accountId = 11800; public static final long accountTypeId = 100; public static final String uid = "cal"; /** * @param args * @throws NamingException * @throws LoginException */ public static void main(String[] args) throws NamingException, LoginException { class UsernamePasswordHandler implements CallbackHandler { public UsernamePasswordHandler() { } public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { int len = callbacks.length; Callback cb; for(int i=0; i<len; i++) { cb = callbacks[i]; if(cb instanceof NameCallback) { NameCallback ncb = (NameCallback)cb; ncb.setName("cal"); } else if (cb instanceof PasswordCallback) { PasswordCallback pcb = (PasswordCallback)cb; pcb.setPassword("cal".toCharArray()); } else { throw new UnsupportedCallbackException(cb, "Unknown callback request"); } } } }; InitialContext ctx = new InitialContext(); // Bind to the remote session bean interface in the running server via JNDI/RMI DocumentRemote docBean = (DocumentRemote) ctx.lookup("tolven/DocumentBean/remote"); AccountDAORemote accountBean = (AccountDAORemote) ctx.lookup("tolven/AccountDAOBean/remote"); ActivationRemote activationBean = (ActivationRemote) ctx.lookup("tolven/ActivationBean/remote"); // Un protected at this point long docCount = docBean.countDocuments(accountId); System.out.println("Account " + accountId + " has " + docCount + " doucments"); // This is unprotected (and works) System.out.println("Attempting to get AccountType: " + accountTypeId); AccountType accountType = accountBean.findAccountType( accountTypeId); System.out.println("AccountType " + accountType.getId() + " Known Type: " + accountType.getKnownType()); // This is unprotected (and works) System.out.println("Attempting to get Account: " + accountId); Account account = accountBean.findAccount( accountId); System.out.println("Account: " + account.getId() + " Title: " + account.getTitle()); // Login now System.out.println("Attempting to log in"); System.setProperty("java.security.auth.login.config", "tolven.auth"); UsernamePasswordHandler handler = new UsernamePasswordHandler(); LoginContext lc = new LoginContext("tolvenLDAP", handler); lc.login(); // ActivationBean is in the tolvenLDAP security domain so unless we present credentials, we're not // getting in. System.out.println("Attempting to get TolvenUser: " + uid); TolvenUser user = activationBean.findUser( uid ); System.out.println("User " + user.getId() + " Last login: " + user.getLastLogin()); // This is unprotected DocBase doc = docBean.findDocument(50320); System.out.println("Doc " + doc.getId() + " Status: " + doc.getStatus()); lc.logout(); } } |
|
From: John C. <jc...@us...> - 2007-01-28 05:51:53
|
Update of /cvsroot/tolven/tolvenClient/src/org/tolven/client In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25283/src/org/tolven/client Log Message: Directory /cvsroot/tolven/tolvenClient/src/org/tolven/client added to the repository |
|
From: John C. <jc...@us...> - 2007-01-28 05:51:53
|
Update of /cvsroot/tolven/tolvenClient/src/org/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25283/src/org/tolven Log Message: Directory /cvsroot/tolven/tolvenClient/src/org/tolven added to the repository |
|
From: John C. <jc...@us...> - 2007-01-28 05:51:53
|
Update of /cvsroot/tolven/tolvenClient/src In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25283/src Log Message: Directory /cvsroot/tolven/tolvenClient/src added to the repository |
|
From: John C. <jc...@us...> - 2007-01-28 05:51:53
|
Update of /cvsroot/tolven/tolvenClient/src/org In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25283/src/org Log Message: Directory /cvsroot/tolven/tolvenClient/src/org added to the repository |
|
From: John C. <jc...@us...> - 2007-01-28 05:51:53
|
Update of /cvsroot/tolven/tolvenClient/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25283/bin Log Message: Directory /cvsroot/tolven/tolvenClient/bin added to the repository |
|
From: John C. <jc...@us...> - 2007-01-28 05:50:24
|
Update of /cvsroot/tolven/tolvenClient In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24826/tolvenClient Log Message: Directory /cvsroot/tolven/tolvenClient added to the repository |
|
From: John C. <jc...@us...> - 2007-01-27 19:07:06
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17018/src/org/tolven/doc/bean Modified Files: XMLProtectedBean.java DocumentBean.java Log Message: Add remote interfaces for document access Index: XMLProtectedBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/XMLProtectedBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XMLProtectedBean.java 21 Jan 2007 00:00:42 -0000 1.1 --- XMLProtectedBean.java 27 Jan 2007 19:07:05 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- import javax.ejb.Local; + import javax.ejb.Remote; import javax.ejb.Stateless; import javax.xml.bind.JAXBException; *************** *** 9,18 **** import org.jboss.annotation.security.SecurityDomain; import org.tolven.doc.XMLProtectedLocal; import org.tolven.doc.entity.DocXML; @Stateless() @Local(XMLProtectedLocal.class) @SecurityDomain("tolvenLDAP") ! public class XMLProtectedBean extends XMLBean implements XMLProtectedLocal { /** --- 10,21 ---- import org.jboss.annotation.security.SecurityDomain; import org.tolven.doc.XMLProtectedLocal; + import org.tolven.doc.XMLProtectedRemote; import org.tolven.doc.entity.DocXML; @Stateless() @Local(XMLProtectedLocal.class) + @Remote(XMLProtectedRemote.class) @SecurityDomain("tolvenLDAP") ! public class XMLProtectedBean extends XMLBean implements XMLProtectedLocal, XMLProtectedRemote { /** Index: DocumentBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DocumentBean.java 20 Jan 2007 19:23:17 -0000 1.18 --- DocumentBean.java 27 Jan 2007 19:07:05 -0000 1.19 *************** *** 24,27 **** --- 24,28 ---- import javax.annotation.Resource; import javax.ejb.Local; + import javax.ejb.Remote; import javax.ejb.Stateless; import javax.persistence.EntityManager; *************** *** 42,45 **** --- 43,47 ---- import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentLocal; + import org.tolven.doc.DocumentRemote; import org.tolven.doc.entity.CCRException; import org.tolven.doc.entity.DocBase; *************** *** 59,63 **** @Stateless() @Local(DocumentLocal.class) ! public class DocumentBean implements DocumentLocal { @PersistenceContext --- 61,66 ---- @Stateless() @Local(DocumentLocal.class) ! @Remote(DocumentRemote.class) ! public class DocumentBean implements DocumentLocal, DocumentRemote { @PersistenceContext |
|
From: John C. <jc...@us...> - 2007-01-27 19:07:06
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17018/src/org/tolven/doc Added Files: XMLProtectedRemote.java DocumentRemote.java Log Message: Add remote interfaces for document access --- NEW FILE: DocumentRemote.java --- package org.tolven.doc; import org.tolven.doc.entity.DocBase; public interface DocumentRemote { /** * Get a document by its internal ID * @param docId the id of the document * @return the document object */ public DocBase findDocument( long docId ); // public DocBase findDocument( long docId, long AccountId ); } --- NEW FILE: XMLProtectedRemote.java --- package org.tolven.doc; import javax.xml.bind.JAXBException; import org.tolven.doc.entity.DocXML; public interface XMLProtectedRemote { /** * <p>This method will unmarshal the XML content of the specified document * into an object graph and return the head of that graph. Subsequent calls to get the graph will * not unmarshal the XML again.</p> * @return the object graph * @throws JAXBException */ public Object unmarshal(DocXML doc) throws JAXBException; } |
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25098/src/org/tolven/gen/model Modified Files: GenMedical.java GenSource.java GenMedicalCCR.java RepeatScenario.java DiabetesGen.java Added Files: AppointmentScenario.java Log Message: Add appointments to generator (no ui yet) Index: DiabetesGen.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/DiabetesGen.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DiabetesGen.java 16 Jan 2007 06:12:46 -0000 1.1 --- DiabetesGen.java 26 Jan 2007 06:45:34 -0000 1.2 *************** *** 56,69 **** new LabTestScenario("urine albumin", "mcg", ">30 mcg", 0, new GaussianValueGen( 35.0, rng.nextUniform(5.1, 11.2)) ) }); // Specify the scenario here. this.setScenario(new ChooseScenario( new ProbabilityScenario[] { new ProbabilityScenario( 0.50, new RepeatScenario( GregorianCalendar.MONTH, 12,1.5, false, 1, 0, ! new GroupScenario( "12 month repeat", new Scenario[] {eagerLab, podiatry, ! new RepeatScenario(GregorianCalendar.MONTH, 6,1.5, false, 1, 1, eagerLab)}))), new ProbabilityScenario( 0.25, new RepeatScenario( GregorianCalendar.MONTH, 8,2.1, true, 0, 0, ! new GroupScenario( "12 month repeat", new Scenario[] {lazyLab, podiatry, ! new RepeatScenario(GregorianCalendar.MONTH, 6,1.5, false, 1, 1, lazyLab) ! }))) })); } --- 56,74 ---- new LabTestScenario("urine albumin", "mcg", ">30 mcg", 0, new GaussianValueGen( 35.0, rng.nextUniform(5.1, 11.2)) ) }); + Scenario annualAppt = new AppointmentScenario( "12 Month diabetes followup", null, null, null); + // Scenario semiAnnualAppt = new AppointmentScenario( "6 Month diabetes lab work", null, null, null); + // Specify the scenario here. this.setScenario(new ChooseScenario( new ProbabilityScenario[] { + // This says on 12 month cycle, do an appointment from which lab and podiatry exam events occur and then, repeat once at a 6 month interval a second lab scenario. + // In addition, we'll schedule an annual appointment for one time in the future. (Ignore six-month appoitment) new ProbabilityScenario( 0.50, new RepeatScenario( GregorianCalendar.MONTH, 12,1.5, false, 1, 0, ! new GroupScenario( "12 month repeat", new Scenario[] {annualAppt, eagerLab, podiatry, ! new RepeatScenario(GregorianCalendar.MONTH, 6,1.5, false, 1, 1, eagerLab)}), annualAppt, 1)), new ProbabilityScenario( 0.25, new RepeatScenario( GregorianCalendar.MONTH, 8,2.1, true, 0, 0, ! new GroupScenario( "12 month repeat", new Scenario[] {annualAppt, lazyLab, podiatry, ! new RepeatScenario(GregorianCalendar.MONTH, 6,1.5, false, 1, 1, lazyLab)}), annualAppt, 1 ! )) })); } Index: RepeatScenario.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/RepeatScenario.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RepeatScenario.java 16 Jan 2007 06:12:45 -0000 1.1 --- RepeatScenario.java 26 Jan 2007 06:45:34 -0000 1.2 *************** *** 29,36 **** private int intervalValue; private double deviation; - private double deviationMs; private boolean resetClock; private int startOffset; private int maxCount; /** * Because this class uses date arithmatic, it's possible that it could look out of control so --- 29,38 ---- private int intervalValue; private double deviation; private boolean resetClock; private int startOffset; private int maxCount; + private Scenario futureScenario; + private int futureCount; + /** * Because this class uses date arithmatic, it's possible that it could look out of control so *************** *** 55,58 **** --- 57,76 ---- */ public RepeatScenario( int intervalType, int intervalValue, double deviation, boolean resetClock, int startOffset, int maxCount, Scenario scenarioToRepeat ) { + this( intervalType, intervalValue, deviation, resetClock, startOffset, maxCount, scenarioToRepeat, null, 0); + } + /** + * This scenario is a bit fancier because it also defines a future scenario. + * Typically used to include appointments in addition to the events of the past. + * @param intervalType + * @param intervalValue + * @param deviation + * @param resetClock + * @param startOffset + * @param maxCount + * @param scenarioToRepeat The scenario to be repeated + * @param futureScenario An alternate scenario to repeated in the future + * @param futureCount How many times to repeat the scenario in the future (over and above maxCount) + */ + public RepeatScenario( int intervalType, int intervalValue, double deviation, boolean resetClock, int startOffset, int maxCount, Scenario scenarioToRepeat, Scenario futureScenario, int futureCount ) { this.intervalType = intervalType; this.intervalValue = intervalValue; *************** *** 64,67 **** --- 82,87 ---- else this.maxCount = maxCount; this.setTitle("Repeat (" + intervalType + "*" + intervalValue + " " + deviation + ")" + scenarioToRepeat.getTitle()); + this.futureScenario = futureScenario; + this.futureCount = futureCount; } *************** *** 104,107 **** --- 124,144 ---- rslt = true; } + // If there's a future count, then we keep going by calling the futureScenario + // Note: Logic is similar but not identical to above. + for ( int x = 0; x < getFutureCount(); x++) { + Date instanceTime; + if (getDeviation()==0.0 ) { + instanceTime = new Date( clock.getTimeInMillis()); + } else { + instanceTime = new Date( ((long)rng.nextGaussian(clock.getTimeInMillis(), getDeviationMs()))); + } + // + // In the future, start and end time are the same. + getFutureScenario().apply(patient, instanceTime, instanceTime, rng ); + // Reset the clock if requested + if (resetClock) clock.setTime(instanceTime); + // Advance the clock with no randomness + clock.add(intervalType, intervalValue); + } return rslt; } *************** *** 149,152 **** --- 186,201 ---- this.startOffset = startOffset; } + public int getFutureCount() { + return futureCount; + } + public void setFutureCount(int futureCount) { + this.futureCount = futureCount; + } + public Scenario getFutureScenario() { + return futureScenario; + } + public void setFutureScenario(Scenario futureScenario) { + this.futureScenario = futureScenario; + } } Index: GenSource.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenSource.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenSource.java 16 Jan 2007 06:12:46 -0000 1.1 --- GenSource.java 26 Jan 2007 06:45:34 -0000 1.2 *************** *** 22,26 **** /** * A source of some kind of medical data to be generated. A source will have an affinity for a certain kind of ! * patients and certain information about that patient. Typically, an individual source will only apply * to a certain age range or gender and perhaps patients with, or without, a specific problem. * Sources can be arranged in a hierarchy with the top-level looking for the broadest matching criteria --- 22,26 ---- /** * A source of some kind of medical data to be generated. A source will have an affinity for a certain kind of ! * patient and certain information about that patient. Typically, an individual source will only apply * to a certain age range or gender and perhaps patients with, or without, a specific problem. * Sources can be arranged in a hierarchy with the top-level looking for the broadest matching criteria Index: GenMedical.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenMedical.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenMedical.java 16 Jan 2007 06:12:46 -0000 1.1 --- GenMedical.java 26 Jan 2007 06:45:34 -0000 1.2 *************** *** 136,139 **** --- 136,145 ---- public abstract void generateRadResult( Date effective, String test, String result, String interpretation ); + /** + * Generate one appointment (typically in the future) + * @return + */ + public abstract void generateAppointment( Date effective, String purpose, String location, String practitioner, String instructions ); + public boolean isMale() { return male; --- NEW FILE: AppointmentScenario.java --- package org.tolven.gen.model; import java.util.Date; import org.apache.commons.math.random.RandomData; public class AppointmentScenario extends Scenario { private String purpose; private String location; private String practitioner; private String instructions; /** * Generate an appoint for the specified purpose * @param purpose */ public AppointmentScenario( String purpose, String location, String practitioner, String instructions) { setTitle( purpose + ", " + location + ", " + practitioner + ", " + instructions); this.purpose = purpose; this.location = location; this.practitioner = practitioner; this.instructions = instructions; } /** * Actually create the appointment. */ public boolean apply(GenMedical patient, Date startTime, Date endTime, RandomData rng ) { patient.generateAppointment( startTime, getPurpose(), getLocation(), getPractitioner(), getInstructions() ); return true; } public String getInstructions() { return instructions; } public void setInstructions(String instructions) { this.instructions = instructions; } public String getLocation() { return location; } public void setLocation(String location) { this.location = location; } public String getPractitioner() { return practitioner; } public void setPractitioner(String practitioner) { this.practitioner = practitioner; } public String getPurpose() { return purpose; } public void setPurpose(String purpose) { this.purpose = purpose; } } Index: GenMedicalCCR.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/gen/model/GenMedicalCCR.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GenMedicalCCR.java 16 Jan 2007 06:12:45 -0000 1.1 --- GenMedicalCCR.java 26 Jan 2007 06:45:34 -0000 1.2 *************** *** 12,16 **** --- 12,18 ---- import org.tolven.ccr.ContinuityOfCareRecord; import org.tolven.ccr.DateTimeType; + import org.tolven.ccr.EncounterType; import org.tolven.ccr.IDType; + import org.tolven.ccr.Location; import org.tolven.ccr.PersonNameType; import org.tolven.ccr.ProblemType; *************** *** 224,226 **** --- 226,252 ---- } + /** + * Generate one appointment (typically in the future) + */ + public void generateAppointment( Date effective, String purpose, String location, String practitioner, String instructions ) { + if (ccr.getBody()==null) ccr.setBody( ccrFactory.createContinuityOfCareRecordBody()); + if (ccr.getBody().getEncounters()==null) ccr.getBody().setEncounters(ccrFactory.createContinuityOfCareRecordBodyEncounters()); + // Add encounter to the CCR Body + EncounterType enc = ccrFactory.createEncounterType(); + // Type = result + enc.setTypeText("Physician Office Visit"); + // Set collection time + enc.setDateTimeType("Encounter DateTime", effective); + enc.setDescriptionText(purpose); + if (location!=null) { + if (enc.getLocations()==null) enc.setLocations(ccrFactory.createLocations()); + Location loc = ccrFactory.createLocation(); + CodedDescriptionType locDesc = ccrFactory.createCodedDescriptionType(); + locDesc.setText(location); + loc.setDescription(locDesc); + enc.getLocations().getLocation().add(loc); + } + ccr.getBody().getEncounters().getEncounter().add(enc); + } + } |
|
From: John C. <jc...@us...> - 2007-01-26 06:45:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25098/src/org/tolven/doc/bean Modified Files: Evaluator.java Log Message: Add appointments to generator (no ui yet) Index: Evaluator.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/Evaluator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Evaluator.java 23 Jan 2007 03:10:37 -0000 1.3 --- Evaluator.java 26 Jan 2007 06:45:34 -0000 1.4 *************** *** 32,35 **** --- 32,36 ---- import org.tolven.ccr.ContinuityOfCareRecord; import org.tolven.ccr.DateTimeType; + import org.tolven.ccr.EncounterType; import org.tolven.ccr.PersonNameType; import org.tolven.ccr.ProblemType; *************** *** 286,289 **** --- 287,320 ---- mdAllPatients.setReference( mdPatient ); menuLocal.persistMenuData(mdAllPatients); + + // Extract Appointments + if (ccr.getBody()!=null && ccr.getBody().getEncounters()!=null) { + MenuStructure msAppointment = menuLocal.findDescendentMenuStructure(docCCR.getAccount().getId(), msPatient, "appointment"); + MenuStructure msAppointmentList = menuLocal.findDescendentMenuStructure(docCCR.getAccount().getId(), msPatient, "pers:appts"); + for (EncounterType encounter : ccr.getBody().getEncounters().getEncounter()) { + // Create the problem + MenuData mdAppointment = new MenuData(); + mdAppointment.setMenuStructure( msAppointment ); + mdAppointment.setDocumentId(docCCR.getId()); + mdAppointment.setAccount(docCCR.getAccount()); + mdAppointment.setParent01(mdPatient); + mdAppointment.setString01(encounter.getDescriptionText()); + mdAppointment.setDate01(encounter.getDateTimeType("Encounter DateTime").getDateValue()); + // mdAppointment.setString02(encounter.getStatusText()); + menuLocal.persistMenuData(mdAppointment); + // Add to patient's appointment list + MenuData mdAppointmentList = new MenuData(); + mdAppointmentList.setMenuStructure( msAppointmentList ); + mdAppointmentList.setDocumentId(docCCR.getId()); + mdAppointmentList.setAccount(docCCR.getAccount()); + mdAppointmentList.setParent01(mdPatient); + mdAppointmentList.setString01(encounter.getDescriptionText()); + mdAppointmentList.setDate01(encounter.getDateTimeType("Encounter DateTime").getDateValue()); + // mdAppointmentList.setString02(encounter.getStatusText()); + mdAppointmentList.setReference(mdAppointment); + menuLocal.persistMenuData(mdAppointmentList); + } + } } + } |
|
From: John C. <jc...@us...> - 2007-01-26 06:45:36
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25098/src/org/tolven/app/bean Modified Files: MenuBean.java Log Message: Add appointments to generator (no ui yet) Index: MenuBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/app/bean/MenuBean.java,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** MenuBean.java 23 Jan 2007 03:10:38 -0000 1.42 --- MenuBean.java 26 Jan 2007 06:45:34 -0000 1.43 *************** *** 60,72 **** */ public MenuStructure findMenuStructure( long accountId, String path) { ! Account account = em.getReference( Account.class, accountId); ! Query query = em.createQuery("SELECT m FROM MenuStructure m WHERE m.account = :account and m.path = :path"); ! query.setParameter("account", account ); ! query.setParameter("path", path); ! MenuStructure item = (MenuStructure)query.getSingleResult(); // for (MenuStructure child : item.getChildren()) { // Make sure children are instantiated in the structure we return // long id = child.getId(); // } ! return item; } --- 60,76 ---- */ public MenuStructure findMenuStructure( long accountId, String path) { ! try { ! Account account = em.getReference( Account.class, accountId); ! Query query = em.createQuery("SELECT m FROM MenuStructure m WHERE m.account = :account and m.path = :path"); ! query.setParameter("account", account ); ! query.setParameter("path", path); ! MenuStructure item = (MenuStructure)query.getSingleResult(); // for (MenuStructure child : item.getChildren()) { // Make sure children are instantiated in the structure we return // long id = child.getId(); // } ! return item; ! } catch (RuntimeException e) { ! throw new IllegalArgumentException( "Error finding path" + path + " in account " + accountId, e); ! } } *************** *** 518,522 **** em.persist( order ); ! MenuStructure summary = new MenuStructure( account, patient, "summary.xhtml", null, 1, "summary", "Overview", "true", null, "tab" ); em.persist( summary ); --- 522,530 ---- em.persist( order ); ! MenuStructure appointment = new MenuStructure( ! account, patient, "appointment.xhtml", "appointmentLink.xhtml", -1, "appointment", "Appointment", "false", "appointment", "placeholder" ); ! em.persist( appointment ); ! ! MenuStructure summary = new MenuStructure( account, patient, "summary.xhtml", null, 1, "summary", "Overview", "true", null, "tab" ); em.persist( summary ); *************** *** 747,751 **** MenuStructure appointments = new MenuStructure( ! account, pers, "appointments.xhtml", null, 9, "appts", "Appointments", "true", null, "list" ); em.persist( appointments ); --- 755,759 ---- MenuStructure appointments = new MenuStructure( ! account, pers, "appointments.xhtml", null, 9, "appts", "Appointments", "true", root.getPath() + ":patient:appointment", "list" ); em.persist( appointments ); |
|
From: Joseph I. <jos...@us...> - 2007-01-24 04:17:19
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15619/jboss-config Modified Files: server.xml Added Files: security-service.xml standardjboss.xml Log Message: Added the files required to switch JACC on. --- NEW FILE: standardjboss.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> <!-- ===================================================================== --> <!-- Standard JBoss EJB Configurations --> <!-- ===================================================================== --> <!-- $Id$ --> <jboss> <!-- The missing-method-permissions-excluded-mode is a boolean that allows the deployer to globally indicate that all methods without a method-permission element should be treated as excluded(= true and the default), or that methods without a method-permission element should be treated as unchecked(= false) --> [...1021 lines suppressed...] <interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor> <interceptor transaction="Container">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor> <interceptor transaction="Container">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor> <!-- BMT --> <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenInstanceInterceptor</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.MessageDrivenTxInterceptorBMT</interceptor> <interceptor transaction="Bean">org.jboss.ejb.plugins.CallValidationInterceptor</interceptor> <interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor> </container-interceptors> <instance-pool>org.jboss.ejb.plugins.MessageDrivenInstancePool</instance-pool> <instance-cache></instance-cache> <persistence-manager></persistence-manager> <container-pool-conf> <MaximumSize>100</MaximumSize> </container-pool-conf> </container-configuration> </container-configurations> </jboss> --- 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> </mbean> <mbean code="org.jboss.security.jacc.SecurityService" name="jboss.security:service=JaccSecurityService" xmbean-dd=""> <xmbean> <descriptors> <injection id="MBeanServerType" setMethod="setMBeanServer" /> <!-- injection id="ObjectNameType" setMethod="setObjectName" /--> </descriptors> <attribute access="read-write" getMethod="getPolicyName" setMethod="setPolicyName"> <description>The policy provider MBean name</description> <name>PolicyName</name> <type>javax.management.ObjectName</type> </attribute> <attribute access="read-write" getMethod="getPolicyAttributeName" setMethod="setPolicyAttributeName"> <description>The Policy attribute name on the PolicyName MBean</description> <name>PolicyAttributeName</name> <type>java.lang.String</type> </attribute> <operation> <name>start</name> </operation> <operation> <name>stop</name> </operation> </xmbean> <attribute name="PolicyName">jboss.security:service=JaccPolicyProvider</attribute> <attribute name="PolicyAttributeName">PolicyProxy</attribute> </mbean> </server> Index: server.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/server.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** server.xml 3 Sep 2006 04:36:11 -0000 1.4 --- server.xml 24 Jan 2007 04:17:16 -0000 1.5 *************** *** 52,59 **** --- 52,61 ---- web-app/security-roles --> + <!-- <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm" certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" allRolesMode="authOnly" /> + --> <!-- A subclass of JBossSecurityMgrRealm that uses the authentication behavior of JBossSecurityMgrRealm, but overrides the authorization *************** *** 72,75 **** --- 74,81 ---- /> --> + <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm" + certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping" + allRolesMode="authOnly" + /> <Host name="localhost" |
|
From: Joseph I. <jos...@us...> - 2007-01-24 04:17:18
|
Update of /cvsroot/tolven/tolven/jboss-config/jbossweb-tomcat55.sar/META-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15619/jboss-config/jbossweb-tomcat55.sar/META-INF Added Files: jboss-service.xml Log Message: Added the files required to switch JACC on. --- NEW FILE: jboss-service.xml --- <?xml version="1.0" encoding="UTF-8"?> <!-- $Id$ --> <server> <!-- Tomcat 5 Service--> <mbean code="org.jboss.web.tomcat.tc5.Tomcat5" name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml"> <!-- You can configure a set of authenticators keyed by http-auth method used. This will apply the same set of authenticators across all web applications. You can override the set of authenticators at the web application level by adding <authenticators> element to the respective jboss-web.xml --> <!-- <attribute name="Authenticators" serialDataType="jbxb"> <java:properties xmlns:java="urn:jboss:java-properties" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd"> <java:property> <java:key>BASIC</java:key> <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value> </java:property> <java:property> <java:key>CLIENT-CERT</java:key> <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value> </java:property> <java:property> <java:key>DIGEST</java:key> <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value> </java:property> <java:property> <java:key>FORM</java:key> <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value> </java:property> <java:property> <java:key>NONE</java:key> <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value> </java:property> </java:properties> </attribute> --> <!-- The JAAS security domain to use in the absense of an explicit security-domain specification in the war WEB-INF/jboss-web.xml --> <attribute name="DefaultSecurityDomain">java:/jaas/other</attribute> <!-- Get the flag indicating if the normal Java2 parent first class loading model should be used over the servlet 2.3 web container first model. --> <attribute name="Java2ClassLoadingCompliance">false</attribute> <!-- A flag indicating if the JBoss Loader should be used. This loader uses a unified class loader as the class loader rather than the tomcat specific class loader. The default is false to ensure that wars have isolated class loading for duplicate jars and jsp files. --> <attribute name="UseJBossWebLoader">false</attribute> <!-- The list of package prefixes that should not be loaded without delegating to the parent class loader before trying the web app class loader. The packages listed here are those tha are used by the web container implementation and cannot be overriden. The format is a comma separated list of the package names. There cannot be any whitespace between the package prefixes. This setting only applies when UseJBossWebLoader=false. --> <attribute name="FilteredPackages">javax.servlet,org.apache.commons.logging</attribute> <attribute name="LenientEjbLink">true</attribute> <!-- Class of the session manager (used if context is marked as 'distributable'. Currently allowed values: - org.jboss.web.tomcat.tc5.session.JBossCacheManager --> <attribute name="ManagerClass">org.jboss.web.tomcat.tc5.session.JBossCacheManager</attribute> <!-- The name of the request attribute under with the authenticated JAAS Subject is stored on successful authentication. If null or empty then the Subject will not be stored. --> <!-- <attribute name="SubjectAttributeName">j_subject</attribute> --> <!-- The SessionIdAlphabet is the set of characters used to create a session Id It must be made up of exactly 65 unique characters <attribute name="SessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</attribute> --> <!-- ******************************************************* ****************** CLUSTERING ************************* ******************************************************* In order to activate HTTP Session clustering for Tomcat make sure you run JBoss's "all" configuration i.e. "run -c all" (the default configuration doesn't contain clustering) Furthermore, you may change SnapshotMode and SnapshotInterval attributes below to indicate when to synchronize changes with the other node(s). If you use Apache+mod_jk(2) you will most probably use the AJP1.3 connector below. Thus, if you so wish, you may comment (i.e. deactivate) the HTTP connector as it won't be used anymore. ******************************************************* ******************************************************* ******************************************************* --> <!-- If you are using clustering, the following two attributes define when the sessions are replicated to the other nodes. The default value, "instant", synchronously replicates changes to the other nodes at the end of requests. In this case, the "SnapshotInterval" attribute is not used. The "interval" mode, in association with the "SnapshotInterval" attribute, indicates that modified sessions will only be replicated every "SnapshotInterval" milliseconds at most. Note that this attribute is not in effect if the replication-granularity is set to FIELD. If it is FIELD, it will be per http request (that is, "instant" mode.) --> <attribute name="SnapshotMode">instant</attribute> <!-- you may switch to "interval" --> <attribute name="SnapshotInterval">2000</attribute> <!-- Whether to use MOD_JK(2) for load balancing with sticky session combined with JvmRoute. If set to true, it will insert a JvmRouteFilter to intercept every request and replace the JvmRoute if it detects a failover. In addition, you will need to set the JvmRoute inside Tomcat, e.g., Engine name="jboss.web" jmvRoute="Node1" defaultHost="localhost" in server.xml. For clustering purpose only. --> <attribute name="UseJK">false</attribute> <attribute name="Domain">jboss.web</attribute> <!-- A mapping to the server security manager service which must be operation compatible with type org.jboss.security.plugins.JaasSecurityManagerServiceMBean. This is only needed if web applications are allowed to flush the security manager authentication cache when the web sessions invalidate. --> <depends optional-attribute-name="SecurityManagerService" proxy-type="attribute">jboss.security:service=JaasSecurityManager </depends> <!-- Needed if using HTTP Session Clustering or if the ClusteredSingleSignOn valve is enabled in the tomcat server.xml file --> <!-- <depends>jboss.cache:service=TomcatClusteringCache</depends> --> <depends>jboss:service=TransactionManager</depends> <!-- Only needed if the org.jboss.web.tomcat.tc5.jca.CachedConnectionValve is enabled in the tomcat server.xml file <depends>jboss.jca:service=CachedConnectionManager</depends> --> <depends>jboss.security:service=JaccSecurityService</depends> </mbean> </server> |
|
From: Joseph I. <jos...@us...> - 2007-01-24 04:17:18
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15619 Modified Files: build.xml Log Message: Added the files required to switch JACC on. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** build.xml 3 Dec 2006 08:46:09 -0000 1.72 --- build.xml 24 Jan 2007 04:17:17 -0000 1.73 *************** *** 33,36 **** --- 33,38 ---- </delete> <delete dir="${tolven.home}/tolven-jboss-4.0.4.GA/docs" /> + <copy file="${tolven.home}/tolven/jboss-config/standardjboss.xml" todir="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/conf" overwrite="true" preservelastmodified="true" /> + <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}"> *************** *** 39,42 **** --- 41,49 ---- </fileset> </copy> + <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/META-INF" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> + <fileset dir="${tolven.home}/tolven/jboss-config/jbossweb-tomcat55.sar/META-INF"> + <include name="jboss-service.xml"/> + </fileset> + </copy> <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-index.jsp" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/index.jsp" overwrite="true" preservelastmodified="true" /> <copy file="${tolven.home}/tolven/jboss-config/tomcat-root-web.xml" tofile="${tolven.home}/tolven-jboss-4.0.4.GA/server/tolven/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF/web.xml" overwrite="true" preservelastmodified="true" /> |
|
From: Joseph I. <jos...@us...> - 2007-01-24 04:17:10
|
Update of /cvsroot/tolven/tolven/jboss-config/jbossweb-tomcat55.sar/META-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15576/jboss-config/jbossweb-tomcat55.sar/META-INF Log Message: Directory /cvsroot/tolven/tolven/jboss-config/jbossweb-tomcat55.sar/META-INF added to the repository |
|
From: Joseph I. <jos...@us...> - 2007-01-24 04:17:10
|
Update of /cvsroot/tolven/tolven/jboss-config/jbossweb-tomcat55.sar In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15576/jboss-config/jbossweb-tomcat55.sar Log Message: Directory /cvsroot/tolven/tolven/jboss-config/jbossweb-tomcat55.sar added to the repository |
|
From: John C. <jc...@us...> - 2007-01-23 14:44:17
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/index In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17694/src/org/tolven/index Modified Files: BrowseBase.java BrowseTransactionFilter.java Log Message: Cosmetic, refactoring Index: BrowseTransactionFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/index/BrowseTransactionFilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrowseTransactionFilter.java 23 Jan 2007 03:13:41 -0000 1.1 --- BrowseTransactionFilter.java 23 Jan 2007 14:44:15 -0000 1.2 *************** *** 5,9 **** import javax.naming.InitialContext; - import javax.naming.NamingException; import javax.servlet.Filter; import javax.servlet.FilterChain; --- 5,8 ---- *************** *** 12,17 **** import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; - import javax.transaction.Status; - import javax.transaction.SystemException; import javax.transaction.UserTransaction; /** --- 11,14 ---- Index: BrowseBase.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/index/BrowseBase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BrowseBase.java 23 Jan 2007 03:13:41 -0000 1.1 --- BrowseBase.java 23 Jan 2007 14:44:15 -0000 1.2 *************** *** 8,12 **** import javax.naming.NamingException; import javax.servlet.ServletConfig; - //import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; --- 8,11 ---- *************** *** 69,74 **** writer.write( "</em> Account: <em>"); writer.write( (String) request.getSession().getAttribute("account")); ! writer.write( "</em>"); writer.write( " <a href='logout.browse'>Logout</a>"); writer.write( "</p>\n"); } --- 68,75 ---- writer.write( "</em> Account: <em>"); writer.write( (String) request.getSession().getAttribute("account")); ! writer.write( "</em><br/>"); writer.write( " <a href='logout.browse'>Logout</a>"); + writer.write( " | <a href='view.browse'>Instance Data Viewer</a>"); + writer.write( " | <a href='metadata.browse'>View All Metadata</a>"); writer.write( "</p>\n"); } *************** *** 76,79 **** --- 77,102 ---- } + /** + * Write preformatted text to the output surrounded by <pre></pre> and with special characters substituted. + * @param str + * @param writer + * @throws IOException + */ + static void writePreformatted( String str, Writer writer) throws IOException { + if (null==str) return; + writer.write( "<pre>"); + for ( int x = 0; x < str.length(); x++ ) { + char c = str.charAt(x); + switch ( c ) { + case '<' : writer.write( "<");break; + case '>' : writer.write( ">");break; + case '&' : writer.write( "&");break; + case '"' : writer.write( """);break; + default : writer.write(c); + } + } + writer.write( "</pre><br/>"); + } + void closePage( Writer writer ) throws IOException { writer.write( "</body>\n"); |
|
From: John C. <jc...@us...> - 2007-01-23 14:43:49
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/index In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17250/src/org/tolven/index Modified Files: Browse.java Log Message: Add column metadata and an option to display all metadata Index: Browse.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/index/Browse.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Browse.java 23 Jan 2007 03:13:41 -0000 1.5 --- Browse.java 23 Jan 2007 14:43:44 -0000 1.6 *************** *** 15,18 **** --- 15,19 ---- import org.tolven.app.bean.MenuPath; import org.tolven.app.bean.MenuQueryControl; + import org.tolven.app.entity.MSColumn; import org.tolven.app.entity.MenuData; import org.tolven.app.entity.MenuStructure; *************** *** 58,61 **** --- 59,63 ---- return; } + // See if we have an account user id. Can't go on without it. AccountUser accountUser = (AccountUser) request.getAttribute("accountUser"); *************** *** 71,75 **** String element = request.getParameter( "element"); ! showLists( accountUser, writer, element); // Display the requested memu data, if any if (element!=null) { --- 73,77 ---- String element = request.getParameter( "element"); ! showAvailableLists( accountUser, writer, element); // Display the requested memu data, if any if (element!=null) { *************** *** 88,91 **** --- 90,102 ---- return; } + if( uri.endsWith("metadata.browse")) { + // Prepare response back to client + Writer writer = openPage( request, response ); + + showAllMenuStructure( accountUser, writer); + closePage(writer); + return; + } + if( uri.endsWith("logout.browse")) { request.getSession(false).invalidate(); *************** *** 102,108 **** } } ! /** ! * Look for any lists that could be queried based on the element we have. * @param top * @param writer --- 113,156 ---- } } ! /** ! * Construct a complete list of all menustructure items (for the current account). ! * @throws IOException ! */ ! void showAllMenuStructure( AccountUser au, Writer writer) throws IOException { ! // Output results in an HTML table ! writer.write( "<p><em>All MenuStructure (Metadata) "); ! writer.write( Long.toString(au.getAccount().getId()) ); ! writer.write( "</em></p>\n"); ! writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); ! writer.write( "<tr>" ); ! writer.write( "<th><em>Id</em></th>"); ! writer.write( "<th><em>Path</em></th>"); ! writer.write( "<th><em>Type</em></th>"); ! writer.write( "<th><em>Title</em></th>"); ! writer.write( "<th><em>Repeating</em></th>"); ! writer.write( "</tr>\n"); ! // Get all metadata (for this account) ! List<MenuStructure> menus = menuLocal.findFullMenuStructure( au.getAccount().getId()); ! for (MenuStructure ms : menus) { ! writer.write( "<tr>" ); ! writer.write( "<td>" + ms.getId() + "</td>"); ! writer.write( "<td>" + ms.getPath() + "</td>"); ! writer.write( "<td>" + ms.getRole() + "</td>"); ! writer.write( "<td>" + ms.getText() + "</td>"); ! writer.write( "<td>"); ! if (ms.getRepeating()!=null) writer.write(ms.getRepeating()); ! else writer.write(" "); ! writer.write( "</td>" ); ! writer.write( "</tr>\n"); ! } ! writer.write( "</table>\n"); ! } ! ! /** ! * Look for any lists that could be queried based on the element we have (or lack thereof). As we select ! * elements that have more or different embedded ids, this list changes. However, this list is not influenced ! * by instance data. For example, If the echr:patient:results:lab list is applicable because a patient has been selected, ! * it doesn't mean that there are necessarily any results in the list. * @param top * @param writer *************** *** 110,121 **** * @throws IOException */ ! void showLists( AccountUser au, Writer writer, String element ) throws IOException { // Output results in an HTML table ! writer.write( "<p>Available Lists</p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); writer.write( "<th><em>Id</em></th>"); writer.write( "<th><em>Path</em></th>"); - writer.write( "<th><em>Type</em></th>"); writer.write( "<th><em>Title</em></th>"); writer.write( "<th><em>Entity</em></th>"); --- 158,171 ---- * @throws IOException */ ! void showAvailableLists( AccountUser au, Writer writer, String element ) throws IOException { // Output results in an HTML table ! writer.write( "<p><em>Available Lists from MenuStructure (Metadata) for element="); ! if (null==element) writer.write("[none]"); ! else writer.write( element ); ! writer.write( "</em></p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); writer.write( "<th><em>Id</em></th>"); writer.write( "<th><em>Path</em></th>"); writer.write( "<th><em>Title</em></th>"); writer.write( "<th><em>Entity</em></th>"); *************** *** 134,138 **** writer.write( "<td>" + getMSRef(ms, elementPath ) + "</td>"); writer.write( "<td>" + ms.getPath() + "</td>"); - writer.write( "<td>" + ms.getRole() + "</td>"); writer.write( "<td>" + ms.getText() + "</td>"); writer.write( "<td>"); writer.write(rslt); writer.write( "</td>" ); --- 184,187 ---- *************** *** 145,148 **** --- 194,224 ---- /** + * Show Column Metatdata for one MenuStructure item + * @throws IOException + */ + void showColumnMetadata( MenuStructure ms, Writer writer) throws IOException { + writer.write( "<p><em>Column Metadata </em></p>\n"); + writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); + writer.write( "<tr>" ); + writer.write( "<th><em>Id</em></th>"); + writer.write( "<th><em>Heading</em></th>"); + writer.write( "<th><em>Internal</em></th>"); + writer.write( "<th><em>DisplayFunctionarguments</em></th>"); + writer.write( "<th><em>Sequence</em></th>"); + writer.write( "</tr>\n"); + for (MSColumn col : ms.getColumns()) { + writer.write( "<tr>\n"); + writer.write( "<td>" + col.getId() + "</td>"); + writer.write( "<td>" + col.getHeading() + "</td>"); + writer.write( "<td>" + col.getInternal() + "</td>"); + writer.write( "<td>" + col.getDisplayFunctionArguments() + "</td>"); + writer.write( "<td>" + col.getSequence() + "</td>"); + writer.write( "</tr>\n"); + } + writer.write( "</table>\n"); + writer.write( "<p>Add filter criteria in the URL as &<em>Heading</em>Filter=<em>value</em></p>\n"); + } + + /** * Collect several parameters and setup the MenuData Query. * @param request The HTTP request *************** *** 156,160 **** // Based on the path we get in the element parameter, get the corresponding menuStructure (metadata) MenuStructure ms = menuLocal.findMenuStructure( au.getAccount().getId(), path.getPath() ); - String repeatingBase = ms.getRepeating(); ctrl.setMenuStructure( ms ); ctrl.setNow( (Date) request.getAttribute("tolvenNow") ); --- 232,235 ---- *************** *** 201,205 **** showQueryInfo(writer, ctrl); // Output results in an HTML table ! writer.write( "<p>Menu data (instance data) for " + ctrl.getRequestedPath()+ "</p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); --- 276,280 ---- showQueryInfo(writer, ctrl); // Output results in an HTML table ! writer.write( "<p><em>MenuData (instance data) for " + ctrl.getRequestedPath()+ "</em></p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); *************** *** 229,234 **** } writer.write( "</table>\n"); } ! /** * Show the document associated with this menu data item, if there is one --- 304,310 ---- } writer.write( "</table>\n"); + showColumnMetadata( ctrl.getMenuStructure(), writer); } ! /** * Show the document associated with this menu data item, if there is one *************** *** 240,258 **** long docId = md.getDocumentId(); if (0==docId) return; ! writer.write( "<p>Document referenced by this menuData item: " + docId + "</p>"); DocBase doc = documentLocal.findDocument(docId); ! writer.write( "<pre>"); ! String str = doc.getContentString(); ! for ( int x = 0; x < str.length(); x++ ) { ! char c = str.charAt(x); ! switch ( c ) { ! case '<' : writer.write( "<");break; ! case '>' : writer.write( ">");break; ! case '&' : writer.write( "&");break; ! case '"' : writer.write( """);break; ! default : writer.write(c); ! } ! } ! writer.write( "</pre><br/>"); } --- 316,322 ---- long docId = md.getDocumentId(); if (0==docId) return; ! writer.write( "<p><em>Document referenced by this menuData item: " + docId + "</em></p>"); DocBase doc = documentLocal.findDocument(docId); ! writePreformatted( doc.getContentString(), writer ); } *************** *** 268,272 **** showQueryInfo(writer, ctrl); // Output results in an HTML table ! writer.write( "<p>Menu data (detail) for " + ctrl.getRequestedPath()+ "</p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); --- 332,336 ---- showQueryInfo(writer, ctrl); // Output results in an HTML table ! writer.write( "<p><em>Menu data (detail) for " + ctrl.getRequestedPath()+ "</em></p>\n"); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); *************** *** 302,306 **** void showQueryInfo(Writer writer, MenuQueryControl ctrl ) throws IOException { ! writer.write( "<p>Query Criteria</p>" ); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); --- 366,370 ---- void showQueryInfo(Writer writer, MenuQueryControl ctrl ) throws IOException { ! writer.write( "<p><em>Query Criteria</em></p>" ); writer.write( "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n"); writer.write( "<tr>" ); *************** *** 433,435 **** --- 497,516 ---- writer.write( "</form>"); } + + /** + * A simple form needed to collect a new problem + * @param writer + * @throws IOException + */ + void problemForm( Writer writer ) throws IOException { + writer.write( "<form method=\"post\" action=\"addproblem.browse\" >" ); + writer.write( "PatientId<br/>"); + writer.write( "<input type=\"text\" name=\"patientId\" size=\"10\" />"); + writer.write( "<br/>"); + writer.write( "<input type=\"text\" name=\"problem\" size=\"20\" />"); + writer.write( "<br/>"); + writer.write( "<input type=\"submit\" name=\"Submit\" value=\"Submit\" /><br/>"); + writer.write( "</form>"); + } + } |
|
From: Joseph I. <jos...@us...> - 2007-01-23 09:38:16
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25766/src/org/tolven/web/security/auth Modified Files: KeyLoginModule.java Log Message: Added the '*' in the KeyLoginModule to match the '*' role in the web.xml security constrant, regardless of whether key encryption is on or not. Now JACC no longer complains when full authorization in effect, and login no longer fails. Index: KeyLoginModule.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/auth/KeyLoginModule.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** KeyLoginModule.java 23 Jan 2007 09:30:28 -0000 1.5 --- KeyLoginModule.java 23 Jan 2007 09:38:14 -0000 1.6 *************** *** 98,101 **** --- 98,126 ---- System.out.println(getClass() + ": begin commit"); try { + // TolvenPrncipal: Ensure there is only one Group called Roles + Group group = null; + for (Iterator iter = subject.getPrincipals(Group.class).iterator(); iter.hasNext();) { + group = (Group) iter.next(); + if ("Roles".equalsIgnoreCase(group.getName())) + break; + group = null; + } + if (group == null) { + } else { + } + if (group == null) + group = new TolvenGroup("Roles"); + // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed + boolean allRolesExists = false; + Principal groupName = null; + for (Enumeration e = group.members(); e.hasMoreElements();) { + groupName = (Principal) e.nextElement(); + if ("*".equalsIgnoreCase(groupName.getName())) { + allRolesExists = true; + break; + } + } + if (!allRolesExists) + group.addMember(new TolvenPrincipal("*")); if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { // Obtain the UserKeyPair if it exists *************** *** 121,149 **** // Populate the Subject System.out.println(getClass() + ": Adding UserPrivateKey to Subject " + principalName); - // TolvenPrncipal: Ensure there is only one Group called Roles - Group group = null; - for (Iterator iter = subject.getPrincipals(Group.class).iterator(); iter.hasNext();) { - group = (Group) iter.next(); - if ("Roles".equalsIgnoreCase(group.getName())) - break; - group = null; - } - if (group == null) { - } else { - } - if (group == null) - group = new TolvenGroup("Roles"); - // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed - boolean allRolesExists = false; - Principal groupName = null; - for (Enumeration e = group.members(); e.hasMoreElements();) { - groupName = (Principal) e.nextElement(); - if ("*".equalsIgnoreCase(groupName.getName())) { - allRolesExists = true; - break; - } - } - if (!allRolesExists) - group.addMember(new TolvenPrincipal("*")); // UserPrivateKey: Ensure there is only one PrivateKeyRing in a Subject by removing any that might be there for (Iterator iter = subject.getPrivateCredentials(PrivateKeyRing.class).iterator(); iter.hasNext();) { --- 146,149 ---- |
|
From: Joseph I. <jos...@us...> - 2007-01-23 09:30:30
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/auth In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22847/src/org/tolven/web/security/auth Modified Files: KeyLoginModule.java Log Message: Corrected poor choice of local variable name, which clashed with instance variable name Index: KeyLoginModule.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/security/auth/KeyLoginModule.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** KeyLoginModule.java 23 Jan 2007 09:12:42 -0000 1.4 --- KeyLoginModule.java 23 Jan 2007 09:30:28 -0000 1.5 *************** *** 136,143 **** // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed boolean allRolesExists = false; ! Principal principalName = null; for (Enumeration e = group.members(); e.hasMoreElements();) { ! principalName = (Principal) e.nextElement(); ! if ("*".equalsIgnoreCase(principalName.getName())) { allRolesExists = true; break; --- 136,143 ---- // TODO: Currently we do not distinguish by role. When roles are supported in LDAP this code can be removed boolean allRolesExists = false; ! Principal groupName = null; for (Enumeration e = group.members(); e.hasMoreElements();) { ! groupName = (Principal) e.nextElement(); ! if ("*".equalsIgnoreCase(groupName.getName())) { allRolesExists = true; break; |
|
From: Joseph I. <jos...@us...> - 2007-01-23 09:12:50
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13325/src/org/tolven/core/bean Modified Files: AccountDAOBean.java ActivationBean.java Log Message: In order to activate encryption, the the tolven property must be set to true, rather than any value: tolven.security.keys.activate=true Index: AccountDAOBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AccountDAOBean.java 20 Jan 2007 19:23:17 -0000 1.22 --- AccountDAOBean.java 23 Jan 2007 09:12:46 -0000 1.23 *************** *** 130,134 **** */ public AccountUser inviteAccountUser(Account account, AccountUser inviterAccountUser, TolvenUser invitedUser, UserPrivateKey anInviterUserPrivateKey, Date now, boolean accountPermission) { ! if (System.getProperty("tolven.security.keys.activate") == null) { return addAccountUser(account, invitedUser, now, accountPermission); } else { --- 130,134 ---- */ public AccountUser inviteAccountUser(Account account, AccountUser inviterAccountUser, TolvenUser invitedUser, UserPrivateKey anInviterUserPrivateKey, Date now, boolean accountPermission) { ! if (!"true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { return addAccountUser(account, invitedUser, now, accountPermission); } else { *************** *** 182,186 **** // experimental, then developers are free to play by setting System // property tolven.security.keys.activate ! if (System.getProperty("tolven.security.keys.activate") != null) setupAccountKeys(account, au, invitation, user); em.persist( au ); --- 182,186 ---- // experimental, then developers are free to play by setting System // property tolven.security.keys.activate ! if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) setupAccountKeys(account, au, invitation, user); em.persist( au ); *************** *** 201,205 **** // TODO: At this point the AccountUser cannot have a PrivateKey if (accountUser.hasAccountPrivateKey()) ! return; if (account.hasPublicKey()) { if (invitation == null) { --- 201,205 ---- // TODO: At this point the AccountUser cannot have a PrivateKey if (accountUser.hasAccountPrivateKey()) ! throw new RuntimeException("AccountUser already has an AccountPrivateKey"); if (account.hasPublicKey()) { if (invitation == null) { *************** *** 217,222 **** } } catch (Exception ex) { ! // TODO: Do nothing but note the fact during development of encryption keys ! System.out.println(getClass() + ": Problem while setting up Account Keys for " + ejbContext.getCallerPrincipal() + " CAUSE: " + ex.getMessage()); } } --- 217,222 ---- } } catch (Exception ex) { ! //TODO: consider declaring exceptions in the method declaration ! throw new RuntimeException(": Problem while setting up Account Keys for " + ejbContext.getCallerPrincipal() + " CAUSE: " + ex.getMessage()); } } Index: ActivationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/ActivationBean.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** ActivationBean.java 21 Jan 2007 00:01:34 -0000 1.29 --- ActivationBean.java 23 Jan 2007 09:12:46 -0000 1.30 *************** *** 195,199 **** */ public TolvenUser loginUser( String principal, Date now) { ! if (System.getProperty("tolven.security.keys.activate") != null) { // Verify that we have a subject to work with if (!principal.equals(ejbContext.getCallerPrincipal().getName())) { --- 195,199 ---- */ public TolvenUser loginUser( String principal, Date now) { ! if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { // Verify that we have a subject to work with if (!principal.equals(ejbContext.getCallerPrincipal().getName())) { |
|
From: Joseph I. <jos...@us...> - 2007-01-23 09:12:50
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13325/src/org/tolven/doc/entity Modified Files: DocBase.java Log Message: In order to activate encryption, the the tolven property must be set to true, rather than any value: tolven.security.keys.activate=true Index: DocBase.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/entity/DocBase.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DocBase.java 20 Jan 2007 19:23:17 -0000 1.19 --- DocBase.java 23 Jan 2007 09:12:46 -0000 1.20 *************** *** 166,170 **** */ public byte[] getContent() { ! if (System.getProperty("tolven.security.keys.activate") != null) { return getDecryptedContent(content); } else { --- 166,170 ---- */ public byte[] getContent() { ! if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { return getDecryptedContent(content); } else { *************** *** 237,241 **** public void setContent(byte[] content) { ! if (System.getProperty("tolven.security.keys.activate") != null) { this.content = getEncryptedContent(content); } else { --- 237,241 ---- public void setContent(byte[] content) { ! if ("true".equalsIgnoreCase(System.getProperty("tolven.security.keys.activate"))) { this.content = getEncryptedContent(content); } else { |
3 messages has been excluded from this view by a project administrator.
