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...> - 2006-08-21 00:27:02
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/org/tolven/security/bean Modified Files: LDAPBean.java LDAPLocal.java Log Message: Add headers and organize imports Index: LDAPBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LDAPBean.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LDAPBean.java 22 Jul 2006 22:10:47 -0000 1.4 --- LDAPBean.java 21 Aug 2006 00:26:29 -0000 1.5 *************** *** 1,27 **** package org.tolven.security.bean; - import javax.annotation.EJB; - import javax.ejb.*; - import java.io.IOException; import java.util.ArrayList; - import java.util.Collection; import java.util.List; - import java.util.Map; import java.util.Properties; ! import java.util.TreeMap; import javax.naming.Context; import javax.naming.NamingEnumeration; import javax.naming.NamingException; - import javax.naming.directory.Attribute; - import javax.naming.directory.Attributes; - import javax.naming.directory.BasicAttribute; import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; - import javax.naming.directory.InitialDirContext; - import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; - import javax.naming.InitialContext; import javax.naming.ldap.LdapContext; --- 1,33 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.security.bean; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Properties; ! ! import javax.annotation.EJB; ! import javax.ejb.Local; ! import javax.ejb.Stateless; import javax.naming.Context; + import javax.naming.InitialContext; import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; Index: LDAPLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/bean/LDAPLocal.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LDAPLocal.java 24 Jun 2006 15:31:43 -0000 1.3 --- LDAPLocal.java 21 Aug 2006 00:26:29 -0000 1.4 *************** *** 1,9 **** package org.tolven.security.bean; import java.io.IOException; - import java.util.ArrayList; import java.util.List; import javax.naming.NamingException; import org.tolven.security.TolvenPerson; --- 1,23 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.security.bean; import java.io.IOException; import java.util.List; + import javax.naming.NamingException; + import org.tolven.security.TolvenPerson; |
|
From: John C. <jc...@us...> - 2006-08-21 00:27:01
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/org/tolven/doc Modified Files: DocumentLocal.java Log Message: Add headers and organize imports Index: DocumentLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/DocumentLocal.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DocumentLocal.java 12 Jul 2006 05:06:57 -0000 1.2 --- DocumentLocal.java 21 Aug 2006 00:26:29 -0000 1.3 *************** *** 1,3 **** ! package org.tolven.doc; --- 1,15 ---- ! /* ! * Copyright (C) 2006 Tolven Inc ! * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... ! */ package org.tolven.doc; |
|
From: John C. <jc...@us...> - 2006-08-21 00:27:01
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/org/tolven/doc/bean Modified Files: DocumentBean.java Log Message: Add headers and organize imports Index: DocumentBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocumentBean.java 12 Jul 2006 05:06:57 -0000 1.3 --- DocumentBean.java 21 Aug 2006 00:26:29 -0000 1.4 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.doc.bean; |
|
From: John C. <jc...@us...> - 2006-08-21 00:27:01
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/org/tolven/security Modified Files: TolvenPerson.java Log Message: Add headers and organize imports Index: TolvenPerson.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/TolvenPerson.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TolvenPerson.java 12 Jul 2006 05:06:57 -0000 1.3 --- TolvenPerson.java 21 Aug 2006 00:26:29 -0000 1.4 *************** *** 1,18 **** /* ! * TolvenPerson.java ! * ! * Created on March 26, 2006, 6:07 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.security; import java.io.Serializable; import java.util.ArrayList; - import java.util.Collection; - import java.util.Date; import java.util.List; import javax.naming.NamingEnumeration; import javax.naming.NamingException; --- 1,21 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.security; import java.io.Serializable; import java.util.ArrayList; import java.util.List; + import javax.naming.NamingEnumeration; import javax.naming.NamingException; *************** *** 22,26 **** import javax.naming.directory.BasicAttributes; import javax.naming.directory.SearchResult; ! import org.tolven.core.entity.TolvenUser; import org.tolven.gen.entity.VirtualPerson; --- 25,29 ---- import javax.naming.directory.BasicAttributes; import javax.naming.directory.SearchResult; ! import org.tolven.gen.entity.VirtualPerson; |
|
From: John C. <jc...@us...> - 2006-08-21 00:26:35
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/rim In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/test/org/tolven/rim Modified Files: ControlActTests.java SimpleDatatypeTests.java CNEDomainTests.java Log Message: Add headers and organize imports Index: CNEDomainTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/rim/CNEDomainTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CNEDomainTests.java 14 Jun 2006 01:53:50 -0000 1.1 --- CNEDomainTests.java 21 Aug 2006 00:26:33 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package test.org.tolven.rim; Index: SimpleDatatypeTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/rim/SimpleDatatypeTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleDatatypeTests.java 14 Jun 2006 01:53:50 -0000 1.1 --- SimpleDatatypeTests.java 21 Aug 2006 00:26:33 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package test.org.tolven.rim; Index: ControlActTests.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/rim/ControlActTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ControlActTests.java 12 Jul 2006 05:06:57 -0000 1.2 --- ControlActTests.java 21 Aug 2006 00:26:33 -0000 1.3 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package test.org.tolven.rim; |
|
From: John C. <jc...@us...> - 2006-08-21 00:26:35
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10002/src/org/tolven/voc/umls Modified Files: ConceptDAO.java LoadMrconsoLocal.java Log Message: Add headers and organize imports Index: LoadMrconsoLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/LoadMrconsoLocal.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LoadMrconsoLocal.java 14 Jun 2006 01:50:53 -0000 1.1 --- LoadMrconsoLocal.java 21 Aug 2006 00:26:31 -0000 1.2 *************** *** 1,3 **** ! package org.tolven.voc.umls; --- 1,15 ---- ! /* ! * Copyright (C) 2006 Tolven Inc ! * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... ! */ package org.tolven.voc.umls; Index: ConceptDAO.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/voc/umls/ConceptDAO.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ConceptDAO.java 14 Jun 2006 01:50:53 -0000 1.1 --- ConceptDAO.java 21 Aug 2006 00:26:30 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.voc.umls; |
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7114/src/org/tolven/web Modified Files: DocAction.java UMLSAction.java TopAction.java TransactionFilter.java PathELResolver.java TolvenAction.java RegisterAction.java ImageCacheFilter.java AccountAction.java InvitationAction.java MenuAction.java UploadMultipartRequestWrapper.java UploadMultipartFilter.java PersonGenAction.java AgeConverter.java LDAPAction.java AgeFormat.java MailResponseWriter.java RequestPerformanceItem.java XMLCacheFilter.java Log Message: Add headers, organize imports Index: PathELResolver.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/PathELResolver.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PathELResolver.java 1 Jul 2006 04:12:57 -0000 1.1 --- PathELResolver.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: PersonGenAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/PersonGenAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PersonGenAction.java 11 Aug 2006 00:14:21 -0000 1.12 --- PersonGenAction.java 21 Aug 2006 00:20:06 -0000 1.13 *************** *** 1,25 **** /* ! * PersonGenAction.java ! * ! * Created on March 26, 2006, 8:46 AM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.web; import java.io.Serializable; - import java.util.Date; import java.util.List; import java.util.Map; - import javax.annotation.EJB; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; - //import javax.transaction.UserTransaction; import org.tolven.app.MenuLocal; --- 1,25 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.web; import java.io.Serializable; import java.util.List; import java.util.Map; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; import org.tolven.app.MenuLocal; *************** *** 35,39 **** import org.tolven.gen.entity.FamilyMember; import org.tolven.gen.entity.FamilyUnit; - import org.tolven.gen.entity.VirtualPerson; import org.tolven.security.TolvenPerson; import org.tolven.security.bean.LDAPLocal; --- 35,38 ---- Index: UMLSAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/UMLSAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UMLSAction.java 24 Jun 2006 17:04:26 -0000 1.2 --- UMLSAction.java 21 Aug 2006 00:20:06 -0000 1.3 *************** *** 1,11 **** /* ! * UMLSAction.java ! * ! * Created on May 4, 2006, 5:10 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.web; --- 1,15 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.web; *************** *** 14,18 **** import java.util.Map; - import javax.annotation.EJB; import javax.faces.context.FacesContext; import javax.faces.model.DataModel; --- 18,21 ---- *************** *** 20,27 **** import javax.naming.InitialContext; import javax.naming.NamingException; ! //import javax.ejb.EJB; ! import org.tolven.core.ActivationLocal; ! import org.tolven.gen.PersonGenerator; ! import org.tolven.security.bean.LDAPLocal; import org.tolven.voc.umls.ConceptDAO; import org.tolven.voc.umls.LoadAbbreviation; --- 23,27 ---- import javax.naming.InitialContext; import javax.naming.NamingException; ! import org.tolven.voc.umls.ConceptDAO; import org.tolven.voc.umls.LoadAbbreviation; Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RegisterAction.java 17 Aug 2006 18:29:19 -0000 1.10 --- RegisterAction.java 21 Aug 2006 00:20:06 -0000 1.11 *************** *** 1,11 **** /* ! * RegisterAction.java ! * ! * Created on April 13, 2006, 6:45 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.web; import java.io.IOException; --- 1,15 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.web; import java.io.IOException; Index: AccountAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AccountAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccountAction.java 16 Aug 2006 23:01:47 -0000 1.4 --- AccountAction.java 21 Aug 2006 00:20:06 -0000 1.5 *************** *** 1,8 **** package org.tolven.web; import java.util.List; - import java.util.Map; - import javax.faces.context.FacesContext; import javax.naming.InitialContext; import javax.naming.NamingException; --- 1,19 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; import java.util.List; import javax.naming.InitialContext; import javax.naming.NamingException; Index: DocAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/DocAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DocAction.java 3 Jul 2006 21:16:42 -0000 1.4 --- DocAction.java 21 Aug 2006 00:20:06 -0000 1.5 *************** *** 1,9 **** /* ! * DocAction.java ! * ! * Created on April 20, 2006, 12:17 AM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ --- 1,14 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ *************** *** 12,16 **** import java.util.Map; - import com.sun.facelets.el.ELText; import javax.faces.context.FacesContext; import javax.naming.InitialContext; --- 17,20 ---- *************** *** 19,25 **** import org.tolven.doc.DocumentLocal; import org.tolven.doc.entity.DocBase; - import org.tolven.gen.PersonGenerator; - import org.tolven.gen.entity.FamilyUnit; - import org.tolven.security.bean.LDAPLocal; /** --- 23,26 ---- Index: TransactionFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TransactionFilter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TransactionFilter.java 20 Aug 2006 06:45:23 -0000 1.10 --- TransactionFilter.java 21 Aug 2006 00:20:06 -0000 1.11 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; *************** *** 4,9 **** import java.util.Date; import java.util.LinkedList; - import java.util.List; - import java.util.Map; import javax.naming.InitialContext; --- 17,20 ---- Index: AgeFormat.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AgeFormat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AgeFormat.java 7 Aug 2006 03:26:46 -0000 1.1 --- AgeFormat.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: AgeConverter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/AgeConverter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AgeConverter.java 7 Aug 2006 03:26:46 -0000 1.3 --- AgeConverter.java 21 Aug 2006 00:20:06 -0000 1.4 *************** *** 1,7 **** package org.tolven.web; - import java.util.Calendar; import java.util.Date; - import java.util.GregorianCalendar; import javax.faces.component.UIComponent; --- 1,18 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; import java.util.Date; import javax.faces.component.UIComponent; Index: RequestPerformanceItem.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RequestPerformanceItem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RequestPerformanceItem.java 16 Aug 2006 18:14:30 -0000 1.1 --- RequestPerformanceItem.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: TolvenAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TolvenAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TolvenAction.java 7 Aug 2006 03:26:46 -0000 1.5 --- TolvenAction.java 21 Aug 2006 00:20:06 -0000 1.6 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MenuAction.java 20 Aug 2006 06:47:18 -0000 1.14 --- MenuAction.java 21 Aug 2006 00:20:06 -0000 1.15 *************** *** 1,4 **** --- 1,22 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; + import java.awt.Color; + import java.io.IOException; + import java.net.URLEncoder; + import java.text.SimpleDateFormat; + import java.util.GregorianCalendar; import java.util.List; import java.util.Map; *************** *** 7,11 **** --- 25,42 ---- import javax.naming.InitialContext; import javax.naming.NamingException; + import javax.servlet.http.HttpSession; + import org.jfree.chart.ChartFactory; + import org.jfree.chart.JFreeChart; + import org.jfree.chart.axis.DateAxis; + import org.jfree.chart.plot.XYPlot; + import org.jfree.chart.renderer.xy.XYItemRenderer; + import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; + import org.jfree.chart.servlet.ServletUtilities; + import org.jfree.data.time.Month; + import org.jfree.data.time.TimeSeries; + import org.jfree.data.time.TimeSeriesCollection; + import org.jfree.data.xy.XYDataset; + import org.jfree.ui.RectangleInsets; import org.tolven.app.MenuLocal; import org.tolven.app.bean.MenuPath; *************** *** 23,30 **** private MenuLocal menuLocal; private String element; private String elementLabel; private long accountId = 0; ! private List<MenuStructure> menus = null; --- 54,63 ---- private MenuLocal menuLocal; + private String graphURL = null; private String element; private String elementLabel; private long accountId = 0; ! private MenuStructure ms; ! private List<MenuStructure> menus = null; *************** *** 47,51 **** */ public MenuStructure getThisMenu( ) { ! MenuStructure ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); // System.out.println( "[MenuAction] MenuStructure fetched for account: " + // ms.getAccount().getId() + ", path: " + ms.getPath()); --- 80,84 ---- */ public MenuStructure getThisMenu( ) { ! if (ms==null) ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); // System.out.println( "[MenuAction] MenuStructure fetched for account: " + // ms.getAccount().getId() + ", path: " + ms.getPath()); *************** *** 158,165 **** */ public List<MenuData> getMenuData( ) { - MenuStructure ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 5000 ); // TODO: This is a hard coded hard query limit that should be in a property or something ! ctrl.setMenuStructure( ms ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); --- 191,197 ---- */ public List<MenuData> getMenuData( ) { MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 5000 ); // TODO: This is a hard coded hard query limit that should be in a property or something ! ctrl.setMenuStructure( getThisMenu() ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); *************** *** 175,182 **** */ public List<MenuData> getSummaryMenuData( ) { - MenuStructure ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 6 ); // TODO: Hard-coded limit of 6 items in summary should be specified in MenuStructure, not here. ! ctrl.setMenuStructure( ms ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); --- 207,213 ---- */ public List<MenuData> getSummaryMenuData( ) { MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 6 ); // TODO: Hard-coded limit of 6 items in summary should be specified in MenuStructure, not here. ! ctrl.setMenuStructure( getThisMenu() ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); *************** *** 192,199 **** */ public long getMenuDataCount( ) { - MenuStructure ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 0 ); ! ctrl.setMenuStructure( ms ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); --- 223,229 ---- */ public long getMenuDataCount( ) { MenuQueryControl ctrl = new MenuQueryControl(); ctrl.setLimit( 0 ); ! ctrl.setMenuStructure( getThisMenu() ); ctrl.setNow( getNow()); ctrl.setOffset( 0 ); *************** *** 207,217 **** /** * Get a single menudata item for the requested element. Throw an exception if more (or less) than one item is found. - * TODO: This could be even faster - probably don't need to get the MenuStructure. * @throws Exception */ public MenuData getMenuDataItem( ) throws Exception { - MenuStructure ms = menuLocal.findMenuStructure( getAccountId(), getTargetMenuPath().getPath() ); MenuQueryControl ctrl = new MenuQueryControl(); ! ctrl.setMenuStructure( ms ); ctrl.setNow( getNow()); ctrl.setOriginalTargetPath( getTargetMenuPath() ); --- 237,245 ---- /** * Get a single menudata item for the requested element. Throw an exception if more (or less) than one item is found. * @throws Exception */ public MenuData getMenuDataItem( ) throws Exception { MenuQueryControl ctrl = new MenuQueryControl(); ! ctrl.setMenuStructure( getThisMenu() ); ctrl.setNow( getNow()); ctrl.setOriginalTargetPath( getTargetMenuPath() ); *************** *** 220,224 **** --- 248,344 ---- } + /** + * Creates a chart based on MenuData + * @param dataset a dataset + * @return A chart suitable for rendering + */ + public JFreeChart createChart(XYDataset dataset) { + + JFreeChart chart = ChartFactory.createTimeSeriesChart( + "Lipds", // title + "Date", // x-axis label + "Value", // y-axis label + dataset, // data + true, // create legend? + true, // generate tooltips? + false // generate URLs? + ); + + chart.setBackgroundPaint(Color.white); + XYPlot plot = (XYPlot) chart.getPlot(); + plot.setBackgroundPaint(Color.lightGray); + plot.setDomainGridlinePaint(Color.white); + plot.setRangeGridlinePaint(Color.white); + plot.setAxisOffset(new RectangleInsets(5.0, 5.0, 5.0, 5.0)); + plot.setDomainCrosshairVisible(true); + plot.setRangeCrosshairVisible(true); + + XYItemRenderer r = plot.getRenderer(); + if (r instanceof XYLineAndShapeRenderer) { + XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) r; + renderer.setBaseShapesVisible(true); + renderer.setBaseShapesFilled(true); + } + DateAxis axis = (DateAxis) plot.getDomainAxis(); + axis.setDateFormatOverride(new SimpleDateFormat("MMM-yyyy")); + return chart; + } + + /** + * Creates a dataset from menuData. + * + * @return An XY dataset + */ + public XYDataset createDataset(String path) { + // Adjust the path to make this work + MenuStructure msLab = menuLocal.findMenuStructure(getAccountId(), path); + // Create a new path based on the matching id(s) from the called path + // for example, if patient were specified in the input nodeValues and the new path has a patient node, then + // it's pulled. + MenuPath mdPath = new MenuPath(msLab.getPath(), getTargetMenuPath() ); + MenuQueryControl ctrl = new MenuQueryControl(); + ctrl.setLimit( 5000 ); // TODO: This is a hard coded hard query limit that should be in a property or something + ctrl.setMenuStructure( msLab ); + ctrl.setNow( getNow()); + ctrl.setOffset( 0 ); + ctrl.setOriginalTargetPath( mdPath ); + ctrl.setRequestedPath( mdPath ); + List<MenuData> menuData = menuLocal.findMenuData( ctrl ); + TimeSeries s1 = new TimeSeries("triglycerides", Month.class); + TimeSeries s2 = new TimeSeries("low-density lipoprotein (LDL)", Month.class); + for ( MenuData md : menuData ) { + TimeSeries sx; + if ("triglycerides".equals(md.getString02())) { + sx = s1; + } + if ("low-density lipoprotein (LDL)".equals(md.getString02())) { + sx = s2; + } else continue; + GregorianCalendar cal = new GregorianCalendar(); + cal.setTime( md.getDate01() ); + Month m = new Month( cal.get(GregorianCalendar.MONTH)+1, cal.get(GregorianCalendar.YEAR)); + sx.add(m, md.getPqValue01()); + System.out.println( "Graph Data: " + m.getMonth() + "/" + m.getYear() + "=" + md.getPqValue01()); + } + + TimeSeriesCollection dataset = new TimeSeriesCollection(); + dataset.addSeries(s1); + dataset.addSeries(s2); + dataset.setDomainIsPointsInTime(true); + + return dataset; + + } + + public String getGraphURL() throws IOException { + if (graphURL==null) { + JFreeChart chart = createChart(createDataset("echr:patient:results:lab")); + String filename = ServletUtilities.saveChartAsPNG(chart, 600, 400, (HttpSession)FacesContext.getCurrentInstance().getExternalContext().getSession(false)); + graphURL = "my.graph?filename=" + URLEncoder.encode(filename, "UTF-8"); + System.out.println("Graph URL: " + graphURL); + } + return graphURL; + } } \ No newline at end of file Index: XMLCacheFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/XMLCacheFilter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XMLCacheFilter.java 1 Aug 2006 15:47:06 -0000 1.3 --- XMLCacheFilter.java 21 Aug 2006 00:20:06 -0000 1.4 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; *************** *** 9,13 **** import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; --- 22,25 ---- Index: UploadMultipartRequestWrapper.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/UploadMultipartRequestWrapper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UploadMultipartRequestWrapper.java 22 Jun 2006 00:23:16 -0000 1.1 --- UploadMultipartRequestWrapper.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: LDAPAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/LDAPAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LDAPAction.java 22 Jul 2006 22:10:49 -0000 1.4 --- LDAPAction.java 21 Aug 2006 00:20:06 -0000 1.5 *************** *** 1,11 **** /* ! * LDAPAction.java ! * ! * Created on March 26, 2006, 5:32 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.web; --- 1,15 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.web; *************** *** 14,20 **** import java.util.Collection; import java.util.List; - import java.util.Map; import java.util.Properties; ! import java.util.TreeMap; import javax.faces.model.SelectItem; import javax.naming.Context; --- 18,23 ---- import java.util.Collection; import java.util.List; import java.util.Properties; ! import javax.faces.model.SelectItem; import javax.naming.Context; *************** *** 22,41 **** import javax.naming.NamingEnumeration; import javax.naming.NamingException; - import javax.naming.directory.Attribute; - import javax.naming.directory.Attributes; - import javax.naming.directory.BasicAttribute; - import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; - import javax.naming.directory.InitialDirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; - import org.tolven.core.ActivationLocal; import org.tolven.core.TolvenPropertiesLocal; import org.tolven.gen.PersonGenerator; - import org.tolven.gen.bean.PersonGeneratorDAO; import org.tolven.security.TolvenPerson; - import org.tolven.security.bean.LDAPLocal; /** --- 25,36 ---- Index: TopAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TopAction.java 16 Aug 2006 18:14:30 -0000 1.9 --- TopAction.java 21 Aug 2006 00:20:06 -0000 1.10 *************** *** 1,11 **** /* ! * TopAction.java ! * ! * Created on March 29, 2006, 10:13 PM * ! * To change this template, choose Tools | Template Manager ! * and open the template in the editor. */ - package org.tolven.web; --- 1,15 ---- /* ! * Copyright (C) 2006 Tolven Inc * ! * This library is free software; you can redistribute it and/or modify it under the terms of ! * the GNU Lesser General Public License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; ! * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! * See the GNU Lesser General Public License for more details. ! * ! * Contact: in...@to... */ package org.tolven.web; Index: MailResponseWriter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MailResponseWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MailResponseWriter.java 22 Jun 2006 00:23:16 -0000 1.1 --- MailResponseWriter.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: ImageCacheFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/ImageCacheFilter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageCacheFilter.java 7 Aug 2006 03:26:46 -0000 1.2 --- ImageCacheFilter.java 21 Aug 2006 00:20:06 -0000 1.3 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: UploadMultipartFilter.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/UploadMultipartFilter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UploadMultipartFilter.java 22 Jun 2006 00:23:16 -0000 1.1 --- UploadMultipartFilter.java 21 Aug 2006 00:20:06 -0000 1.2 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; Index: InvitationAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/InvitationAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** InvitationAction.java 17 Aug 2006 19:55:15 -0000 1.4 --- InvitationAction.java 21 Aug 2006 00:20:06 -0000 1.5 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.web; |
|
From: John C. <jc...@us...> - 2006-08-21 00:20:09
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7114/src/org/tolven/ajax Modified Files: DocServlet.java AjaxServlet.java AsyncServlet.java Log Message: Add headers, organize imports Index: AsyncServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AsyncServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AsyncServlet.java 3 Aug 2006 12:36:56 -0000 1.2 --- AsyncServlet.java 21 Aug 2006 00:20:06 -0000 1.3 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.ajax; Index: AjaxServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/AjaxServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AjaxServlet.java 20 Aug 2006 06:46:20 -0000 1.9 --- AjaxServlet.java 21 Aug 2006 00:20:06 -0000 1.10 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.ajax; import java.io.IOException; Index: DocServlet.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/ajax/DocServlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DocServlet.java 3 Aug 2006 12:36:18 -0000 1.4 --- DocServlet.java 21 Aug 2006 00:20:06 -0000 1.5 *************** *** 1,2 **** --- 1,15 ---- + /* + * Copyright (C) 2006 Tolven Inc + * + * This library is free software; you can redistribute it and/or modify it under the terms of + * the GNU Lesser General Public License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Contact: in...@to... + */ package org.tolven.ajax; import java.awt.Color; *************** *** 9,16 **** import java.awt.image.ImageProducer; import java.awt.image.ReplicateScaleFilter; - import java.io.File; import java.io.IOException; import java.io.InputStream; - import java.io.OutputStream; import java.io.Writer; import java.util.List; --- 22,27 ---- *************** *** 29,33 **** import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; - import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentLocal; import org.tolven.doc.entity.DocBase; --- 40,43 ---- |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:18:13
|
Update of /cvsroot/tolven/tolven/lib/openLDAP In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5846/lib/openLDAP Added Files: openldap-2.2.29_README.txt openldap-2.2.29_LICENSE.txt db-4.3.29_README.txt openssl-0.9.8a_LICENSE.txt gnu-regex-2.3.2_README.txt db-4.3.29_LICENSE.txt openssl-0.9.8a_README.txt Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version --- NEW FILE: db-4.3.29_README.txt --- Sleepycat Software: Berkeley DB 4.3.29: (September 6, 2005) This is version 4.3.29 of Berkeley DB from Sleepycat Software. To view the release and installation documentation, load the distribution file docs/index.html into your web browser. --- NEW FILE: db-4.3.29_LICENSE.txt --- /*- * $Id: db-4.3.29_LICENSE.txt,v 1.1 2006/08/21 00:18:08 joseph_isaac Exp $ */ The following is the license that applies to this copy of the Berkeley DB software. For a license to use the Berkeley DB software under conditions other than those described here, or to purchase support for this software, please contact Sleepycat Software by email at in...@sl..., or on the Web at http://www.sleepycat.com. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= /* * Copyright (c) 1990-2004 * Sleepycat Software. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Redistributions in any form must be accompanied by information on * how to obtain complete source code for the DB software and any * accompanying software that uses the DB software. The source code * must either be included in the distribution or be available for no * more than the cost of distribution plus a nominal fee, and must be * freely redistributable under reasonable conditions. For an * executable file, complete source code means the source code for all * modules it contains. It does not include source code for modules or * files that typically accompany the major components of the operating * system on which the executable file runs. * * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ /* * Copyright (c) 1990, 1993, 1994, 1995 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ /* * Copyright (c) 1995, 1996 * The President and Fellows of Harvard University. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ --- NEW FILE: openssl-0.9.8a_LICENSE.txt --- LICENSE ISSUES ============== The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit. See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact ope...@op.... OpenSSL License --------------- /* ==================================================================== * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. All advertising materials mentioning features or use of this * software must display the following acknowledgment: * "This product includes software developed by the OpenSSL Project * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" * * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to * endorse or promote products derived from this software without * prior written permission. For written permission, please contact * ope...@op.... * * 5. Products derived from this software may not be called "OpenSSL" * nor may "OpenSSL" appear in their names without prior written * permission of the OpenSSL Project. * * 6. Redistributions of any form whatsoever must retain the following * acknowledgment: * "This product includes software developed by the OpenSSL Project * for use in the OpenSSL Toolkit (http://www.openssl.org/)" * * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * ==================================================================== * * This product includes cryptographic software written by Eric Young * (ea...@cr...). This product includes software written by Tim * Hudson (tj...@cr...). * */ Original SSLeay License ----------------------- /* Copyright (C) 1995-1998 Eric Young (ea...@cr...) * All rights reserved. * * This package is an SSL implementation written * by Eric Young (ea...@cr...). * The implementation was written so as to conform with Netscapes SSL. * * This library is free for commercial and non-commercial use as long as * the following conditions are aheared to. The following conditions * apply to all code found in this distribution, be it the RC4, RSA, * lhash, DES, etc., code; not just the SSL code. The SSL documentation * included with this distribution is covered by the same copyright terms * except that the holder is Tim Hudson (tj...@cr...). * * Copyright remains Eric Young's, and as such any Copyright notices in * the code are not to be removed. * If this package is used in a product, Eric Young should be given attribution * as the author of the parts of the library used. * This can be in the form of a textual message at program startup or * in documentation (online or textual) provided with the package. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * "This product includes cryptographic software written by * Eric Young (ea...@cr...)" * The word 'cryptographic' can be left out if the rouines from the library * being used are not cryptographic related :-). * 4. If you include any Windows specific code (or a derivative thereof) from * the apps directory (application code) you must include an acknowledgement: * "This product includes software written by Tim Hudson (tj...@cr...)" * * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * The licence and distribution terms for any publically available version or * derivative of this code cannot be changed. i.e. this code cannot simply be * copied and put under another distribution licence * [including the GNU Public Licence.] */ --- NEW FILE: gnu-regex-2.3.2_README.txt --- This package contains the GNU implementation of POSIX regular expression handling in C, intended for building under the Mingw32 system for Microsoft Windows. It is taken from the GNU C library, version 2.3.2, which is distributed by GNU under the GNU Lesser General Public License. I have not modified the code in any way. A copy of that license is in the file COPYING in the same directory as this file. To build the library, simply start up an MSYS shell, change to this directory and run the 'make' command. -- Lucas Bergman <lu...@be...> 2 April 2004 --- NEW FILE: openldap-2.2.29_README.txt --- OpenLDAP 2.2 README For a description of what this distribution contains, see the ANNOUNCEMENT file in this directory. For a description of changes from previous releases, see the CHANGES file in this directory. This is 2.2 release, it includes significant changes from prior releases. REQUIRED SOFTWARE Building OpenLDAP Software requires a number of software packages to be preinstalled. Additional information regarding prerequisite software can be found in the OpenLDAP Administrator's Guide. Base system (libraries and tools): Standard C compiler (required) Cyrus SASL 2.1.18+ (recommended) OpenSSL 0.9.7+ (recommended) POSIX REGEX software (required) SLAPD: BDB backend requires (latest) Sleepycat Berkeley DB 4.2 LDBM backend requires a compatible database manager [Berkeley DB, GDBM, etc.] SLURPD: LTHREAD compatible thread package [POSIX threads, Mach Cthreads, select others] CLIENTS/CONTRIB ware: Depends on package. See per package README. MAKING AND INSTALLING THE DISTRIBUTION Please see the INSTALL file for basic instructions. More detailed instructions can be found in the OpenLDAP Admnistrator's Guide (see DOCUMENTATION section). DOCUMENTATION There are man pages for most programs in the distribution and routines in the various libraries. See ldap(3) for details. The OpenLDAP website is available and contains the latest LDAP news, releases announcements, pointers to other LDAP resources, etc.. It is located at <http://www.OpenLDAP.org/>. The OpenLDAP Administrator's Guide and other documentation is available at <http://www.openldap.org/doc/>. The OpenLDAP Software FAQ is available at <http://www.openldap.org/faq/>. SUPPORT / FEEDBACK / PROBLEM REPORTS / DISCUSSIONS OpenLDAP is user supported. If you have problems, please review the OpenLDAP FAQ <http://www.openldap.org/faq/> and archives of the OpenLDAP-software and OpenLDAP-bugs mailing lists <http://www.openldap.org/lists/>. If you cannot find the answer, please enquire on the OpenLDAP-software list. Issues, such as bug reports, should be reported using our our Issue Tracking System <http://www.OpenLDAP.org/its/>. Do not use this system for software enquiries. Please direct these to an appropriate mailing list. CONTRIBUTING See <http://www.openldap.org/devel/contributing.html> for information regarding how to contribute code or documentation to the OpenLDAP Project for inclusion in OpenLDAP Software. While you are encouraged to coordinate and discuss the development activities on the <ope...@op...> mailing list prior to submission, it is noted that contributions must be submitted using the Issue Tracking System <http://www.openldap.org/its/> to be considered. --- $OpenLDAP: pkg/ldap/README,v 1.35.2.12 2005/02/21 18:41:58 kurt Exp $ This work is part of OpenLDAP Software <http://www.openldap.org/>. Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted only as authorized by the OpenLDAP Public License. A copy of this license is available in the file LICENSE in the top-level directory of the distribution or, alternatively, at <http://www.OpenLDAP.org/license.html>. OpenLDAP is a registered trademark of the OpenLDAP Foundation. --- NEW FILE: openldap-2.2.29_LICENSE.txt --- The OpenLDAP Public License Version 2.8, 17 August 2003 Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: 1. Redistributions in source form must retain copyright statements and notices, 2. Redistributions in binary form must reproduce applicable copyright statements and notices, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution, and 3. Redistributions must contain a verbatim copy of this document. The OpenLDAP Foundation may revise this license from time to time. Each revision is distinguished by a version number. You may use this Software under terms of this license revision or under the terms of any subsequent revision of the license. THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The names of the authors and copyright holders must not be used in advertising or otherwise to promote the sale, use or other dealing in this Software without specific, written prior permission. Title to copyright in this Software shall at all times remain with copyright holders. OpenLDAP is a registered trademark of the OpenLDAP Foundation. Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved. Permission to copy and distribute verbatim copies of this document is granted. --- NEW FILE: openssl-0.9.8a_README.txt --- OpenSSL 0.9.8a 11 Oct 2005 Copyright (c) 1998-2005 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson All rights reserved. DESCRIPTION ----------- The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, fully featured, and Open Source toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library. The project is managed by a worldwide community of volunteers that use the Internet to communicate, plan, and develop the OpenSSL toolkit and its related documentation. OpenSSL is based on the excellent SSLeay library developed from Eric A. Young and Tim J. Hudson. The OpenSSL toolkit is licensed under a dual-license (the OpenSSL license plus the SSLeay license) situation, which basically means that you are free to get and use it for commercial and non-commercial purposes as long as you fulfill the conditions of both licenses. OVERVIEW -------- The OpenSSL toolkit includes: libssl.a: Implementation of SSLv2, SSLv3, TLSv1 and the required code to support both SSLv2, SSLv3 and TLSv1 in the one server and client. libcrypto.a: General encryption and X.509 v1/v3 stuff needed by SSL/TLS but not actually logically part of it. It includes routines for the following: Ciphers libdes - EAY's libdes DES encryption package which has been floating around the net for a few years. It includes 15 'modes/variations' of DES (1, 2 and 3 key versions of ecb, cbc, cfb and ofb; pcbc and a more general form of cfb and ofb) including desx in cbc mode, a fast crypt(3), and routines to read passwords from the keyboard. RC4 encryption, RC2 encryption - 4 different modes, ecb, cbc, cfb and ofb. Blowfish encryption - 4 different modes, ecb, cbc, cfb and ofb. IDEA encryption - 4 different modes, ecb, cbc, cfb and ofb. Digests MD5 and MD2 message digest algorithms, fast implementations, SHA (SHA-0) and SHA-1 message digest algorithms, MDC2 message digest. A DES based hash that is popular on smart cards. Public Key RSA encryption/decryption/generation. There is no limit on the number of bits. DSA encryption/decryption/generation. There is no limit on the number of bits. Diffie-Hellman key-exchange/key generation. There is no limit on the number of bits. X.509v3 certificates X509 encoding/decoding into/from binary ASN1 and a PEM based ASCII-binary encoding which supports encryption with a private key. Program to generate RSA and DSA certificate requests and to generate RSA and DSA certificates. Systems The normal digital envelope routines and base64 encoding. Higher level access to ciphers and digests by name. New ciphers can be loaded at run time. The BIO io system which is a simple non-blocking IO abstraction. Current methods supported are file descriptors, sockets, socket accept, socket connect, memory buffer, buffering, SSL client/server, file pointer, encryption, digest, non-blocking testing and null. Data structures A dynamically growing hashing system A simple stack. A Configuration loader that uses a format similar to MS .ini files. openssl: A command line tool that can be used for: Creation of RSA, DH and DSA key parameters Creation of X.509 certificates, CSRs and CRLs Calculation of Message Digests Encryption and Decryption with Ciphers SSL/TLS Client and Server Tests Handling of S/MIME signed or encrypted mail PATENTS ------- Various companies hold various patents for various algorithms in various locations around the world. _YOU_ are responsible for ensuring that your use of any algorithms is legal by checking if there are any patents in your country. The file contains some of the patents that we know about or are rumored to exist. This is not a definitive list. RSA Security holds software patents on the RC5 algorithm. If you intend to use this cipher, you must contact RSA Security for licensing conditions. Their web page is http://www.rsasecurity.com/. RC4 is a trademark of RSA Security, so use of this label should perhaps only be used with RSA Security's permission. The IDEA algorithm is patented by Ascom in Austria, France, Germany, Italy, Japan, the Netherlands, Spain, Sweden, Switzerland, UK and the USA. They should be contacted if that algorithm is to be used; their web page is http://www.ascom.ch/. The MDC2 algorithm is patented by IBM. INSTALLATION ------------ To install this package under a Unix derivative, read the INSTALL file. For a Win32 platform, read the INSTALL.W32 file. For OpenVMS systems, read INSTALL.VMS. Read the documentation in the doc/ directory. It is quite rough, but it lists the functions; you will probably have to look at the code to work out how to use them. Look at the example programs. PROBLEMS -------- For some platforms, there are some known problems that may affect the user or application author. We try to collect those in doc/PROBLEMS, with current thoughts on how they should be solved in a future of OpenSSL. SUPPORT ------- If you have any problems with OpenSSL then please take the following steps first: - Download the current snapshot from ftp://ftp.openssl.org/snapshot/ to see if the problem has already been addressed - Remove ASM versions of libraries - Remove compiler optimisation flags If you wish to report a bug then please include the following information in any bug report: - On Unix systems: Self-test report generated by 'make report' - On other systems: OpenSSL version: output of 'openssl version -a' OS Name, Version, Hardware platform Compiler Details (name, version) - Application Details (name, version) - Problem Description (steps that will reproduce the problem, if known) - Stack Traceback (if the application dumps core) Report the bug to the OpenSSL project via the Request Tracker (http://www.openssl.org/support/rt2.html) by mail to: ope...@op... Note that mail to ope...@op... is recorded in the publicly readable request tracker database and is forwarded to a public mailing list. Confidential mail may be sent to ope...@op... (PGP key available from the key servers). HOW TO CONTRIBUTE TO OpenSSL ---------------------------- Development is coordinated on the openssl-dev mailing list (see http://www.openssl.org for information on subscribing). If you would like to submit a patch, send it to ope...@op... with the string "[PATCH]" in the subject. Please be sure to include a textual explanation of what your patch does. Note: For legal reasons, contributions from the US can be accepted only if a TSU notification and a copy of the patch are sent to cr...@bi... (formerly BXA) with a copy to the ENC Encryption Request Coordinator; please take some time to look at http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic] and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)) for the details. If "your encryption source code is too large to serve as an email attachment", they are glad to receive it by fax instead; hope you have a cheap long-distance plan. Our preferred format for changes is "diff -u" output. You might generate it like this: # cd openssl-work # [your changes] # ./Configure dist; make clean # cd .. # diff -ur openssl-orig openssl-work > mydiffs.patch |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:18:12
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5846 Modified Files: build.xml Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** build.xml 20 Aug 2006 22:45:22 -0000 1.42 --- build.xml 21 Aug 2006 00:18:09 -0000 1.43 *************** *** 5,14 **** <filter token="ldap.java.naming.provider.url" value="${ldap.java.naming.provider.url}"/> <filter token="tolven-jdbc-url" value="${jdbc.url}"/> - <filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/> - <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> - <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> - <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> - <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> - <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> <target name="createPropertiesFiles"> <copy file="template/ant-build.template" toFile="resources/ant-build.properties"/> --- 5,8 ---- *************** *** 58,63 **** <echo message="A copy of ldapserver.password is located in ${tolven.security.credentials.dir}/ldap" /> <mkdir dir="${ldap.location}/tolvendata"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > <fileset dir="ldap-config/"> </fileset> </copy> --- 52,63 ---- <echo message="A copy of ldapserver.password is located in ${tolven.security.credentials.dir}/ldap" /> <mkdir dir="${ldap.location}/tolvendata"/> ! <exec executable="${tolven.security.slappasswd.command}" outputproperty="hashed-slapd-ldapserver.password"> ! <arg line="-s ${tolven.ldap.password}"/> ! </exec> ! <filter token="slapd-conf-rootpw" value="${hashed-slapd-ldapserver.password}"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="ldap-config/"> + <include name="slapd.conf"/> + <include name="tolveninitial.ldif"/> </fileset> </copy> *************** *** 100,103 **** --- 100,105 ---- <echo message="pgserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> <echo message="A copy of pgserver.password is located in ${tolven.security.credentials.dir}/db" /> + <filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/> + <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> *************** *** 138,141 **** --- 140,147 ---- </fileset> </copy> + <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> + <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> + <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> + <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:18:11
|
Update of /cvsroot/tolven/tolven/ldap-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5846/ldap-config Modified Files: slapd.conf Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version Index: slapd.conf =================================================================== RCS file: /cvsroot/tolven/tolven/ldap-config/slapd.conf,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** slapd.conf 14 Aug 2006 02:46:07 -0000 1.3 --- slapd.conf 21 Aug 2006 00:18:09 -0000 1.4 *************** *** 16,20 **** # Cleartext passwords, especially for the rootdn, should # be avoided. ! rootpw secret # The database directory MUST exist prior to running slapd. --- 16,20 ---- # Cleartext passwords, especially for the rootdn, should # be avoided. ! rootpw @slapd-conf-rootpw@ # The database directory MUST exist prior to running slapd. |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:18:11
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5846/template Modified Files: ant-build.template Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ant-build.template 20 Aug 2006 22:45:22 -0000 1.36 --- ant-build.template 21 Aug 2006 00:18:09 -0000 1.37 *************** *** 29,32 **** --- 29,33 ---- #certificate creation where tolven.security.build.dir is relative to the security-config or could be absolute tolven.security.openssl.command=${openSSL.location}/bin/openSSL.exe + tolven.security.slappasswd.command=${openLDAP.location}/bin/slappasswd.exe tolven.security.keytool.command=${java.home}/bin/keytool.exe tolven.security.credentials.dir=${tolven.location}/security-config/credentials *************** *** 74,77 **** --- 75,79 ---- tolven.dist.jsf.location=c:/jsf-1.2-b20-FCS tolven.dist.openSSL.location=c:/OpenSSL + tolven.dist.openLDAP.location=c:/OpenLDAP # Normally, these don't change *************** *** 81,84 **** --- 83,87 ---- openSSL.location=${tolven.location}/lib/openSSL + openLDAP.location=${tolven.location}/lib/openLDAP jaxb.location=${tolven.location}/lib/jaxb commons-codec.location=${tolven.location}/lib/commons-codec |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:18:11
|
Update of /cvsroot/tolven/tolven/lib/openLDAP/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5846/lib/openLDAP/bin Added Files: libldap_r.dll slappasswd.exe libssl.dll libcrypto.dll libdb-4.3.dll liblber.dll Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version --- NEW FILE: libssl.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libldap_r.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: liblber.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libdb-4.3.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: slappasswd.exe --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libcrypto.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:16:42
|
Update of /cvsroot/tolven/tolvenEJB/resources/ldap In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5837/resources/ldap Removed Files: tolven.ldif slapd.conf Log Message: Removed the root password from slapd.conf, and now via filtering replace it by an SSHA version --- tolven.ldif DELETED --- --- slapd.conf DELETED --- |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:16:37
|
Update of /cvsroot/tolven/tolven/lib/openLDAP In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5814/lib/openLDAP Log Message: Directory /cvsroot/tolven/tolven/lib/openLDAP added to the repository |
|
From: Joseph I. <jos...@us...> - 2006-08-21 00:16:37
|
Update of /cvsroot/tolven/tolven/lib/openLDAP/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5814/lib/openLDAP/bin Log Message: Directory /cvsroot/tolven/tolven/lib/openLDAP/bin added to the repository |
|
From: Joseph I. <jos...@us...> - 2006-08-20 23:04:05
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8413/template Modified Files: tolven.template Log Message: Removed the password from tolven-ldap-service.xml to ldapserver.password, which exists in the ${deploy.location}/conf and its corresponding hashed value is located in login-config.xml under the tolvenApplicationLDAP SecurityDomain Index: tolven.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/tolven.template,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tolven.template 16 Jul 2006 20:08:43 -0000 1.2 --- tolven.template 20 Aug 2006 23:04:02 -0000 1.3 *************** *** 16,19 **** tolven.ldap.genGroupDN=cn=gen,ou=groups,dc=tolven,dc=com tolven.ldap.rootDN=cn=Manager,dc=tolven,dc=com - tolven.ldap.rootPassword=secret --- 16,18 ---- |
|
From: Joseph I. <jos...@us...> - 2006-08-20 23:04:02
|
Update of /cvsroot/tolven/tolvenEJB/src/test/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8307/src/test/org/tolven/core/bean Modified Files: TolvenPropertiesTest.java Log Message: Removed the password from tolven-ldap-service.xml to ldapserver.password, which exists in the ${deploy.location}/conf and its corresponding hashed value is located in login-config.xml under the tolvenApplicationLDAP SecurityDomain Index: TolvenPropertiesTest.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/test/org/tolven/core/bean/TolvenPropertiesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TolvenPropertiesTest.java 28 Jun 2006 20:50:42 -0000 1.1 --- TolvenPropertiesTest.java 20 Aug 2006 23:03:59 -0000 1.2 *************** *** 45,49 **** assertNotNull(properties.get( "tolven.ldap.genGroupDN")); assertNotNull(properties.get( "tolven.ldap.rootDN")); - assertNotNull(properties.get( "tolven.ldap.rootPassword")); } --- 45,48 ---- |
|
From: Joseph I. <jos...@us...> - 2006-08-20 22:59:38
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6623/jboss-config Modified Files: tolven-ldap-service.xml Log Message: Actually removed the password which was there for testing Index: tolven-ldap-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/tolven-ldap-service.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tolven-ldap-service.xml 20 Aug 2006 22:45:22 -0000 1.5 --- tolven-ldap-service.xml 20 Aug 2006 22:59:35 -0000 1.6 *************** *** 11,16 **** java.naming.factory.initial=com.sun.jndi.ldap.LdapCtxFactory java.naming.provider.url=@ldap.java.naming.provider.url@ - java.naming.security.principal=cn=Manager,dc=tolven,dc=com - java.naming.security.credentials=secret </attribute> <attribute name="InitialContext"> --- 11,14 ---- |
|
From: Joseph I. <jos...@us...> - 2006-08-20 22:45:24
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv847 Modified Files: build.xml Log Message: Removed the password from tolven-ldap-service.xml to ldapserver.password, which exists in the ${deploy.location}/conf and its corresponding hashed value is located in login-config.xml under the tolvenApplicationLDAP SecurityDomain Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** build.xml 20 Aug 2006 02:48:13 -0000 1.41 --- build.xml 20 Aug 2006 22:45:22 -0000 1.42 *************** *** 5,8 **** --- 5,14 ---- <filter token="ldap.java.naming.provider.url" value="${ldap.java.naming.provider.url}"/> <filter token="tolven-jdbc-url" value="${jdbc.url}"/> + <filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/> + <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> + <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> + <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> + <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> + <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> <target name="createPropertiesFiles"> <copy file="template/ant-build.template" toFile="resources/ant-build.properties"/> *************** *** 34,37 **** --- 40,60 ---- <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> + <fail unless="tolven.security.ldap.salt" /> + <fail unless="tolven.security.ldap.iterations" /> + <fail unless="tolven.security.openssl.ldap.dir" /> + <input message="Please enter the LDAP password to be hashed" addproperty="tolven.ldap.keystore.password" /> + <input message="Please enter a keystore password to protect the LDAP password" addproperty="tolven.ldap.keystore.password" /> + <delete dir="${tolven.security.openssl.ldap.dir}/ldapserver.password" /> + <mkdir dir="${tolven.security.openssl.ldap.dir}"/> + <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> + <arg value="${tolven.security.ldap.salt}" /> + <arg value="${tolven.security.ldap.iterations}" /> + <arg value="${tolven.ldap.keystore.password}" /> + <arg value="${tolven.security.openssl.ldap.dir}/ldapserver.password" /> + </java> + <copy file="${tolven.security.openssl.ldap.dir}/ldapserver.password" toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" /> + <move file="${tolven.security.openssl.ldap.dir}/ldapserver.password" toDir="${tolven.security.credentials.dir}/ldap" overwrite="true" /> + <echo message="ldapserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> + <echo message="A copy of ldapserver.password is located in ${tolven.security.credentials.dir}/ldap" /> <mkdir dir="${ldap.location}/tolvendata"/> <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > *************** *** 60,71 **** </copy> <delete file="${deploy.location}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml"/> - <!-- org.jboss.security.plugins.PBEUtils outputs the literal string "Encoded password: ", followed by the required hashed password, so some effort is required to remove the literal string --> - <!-- Create the pgserver.password file. Copy and update the template login-config.xml with the hashed versioned of the password --> - <!-- Update tolven-ds.xml with the salt and iterations --> <fail unless="tolven.security.db.salt" /> <fail unless="tolven.security.db.iterations" /> <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> ! <delete file="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> <mkdir dir="${tolven.security.openssl.db.dir}"/> <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> --- 83,92 ---- </copy> <delete file="${deploy.location}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml"/> <fail unless="tolven.security.db.salt" /> <fail unless="tolven.security.db.iterations" /> + <fail unless="tolven.security.openssl.db.dir" /> <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> ! <delete dir="${tolven.security.openssl.db.dir}/pgserver.password" /> <mkdir dir="${tolven.security.openssl.db.dir}"/> <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> *************** *** 75,90 **** <arg value="${tolven.security.openssl.db.dir}/pgserver.password" /> </java> - <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.db.dir}/temp-pgserver.password" failonerror="true"> - <arg value="${tolven.security.db.salt}" /> - <arg value="${tolven.security.db.iterations}" /> - <arg value="${tolven.database.keystore.password}" /> - <arg value="${tolven.database.password}" /> - </java> <copy file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" /> <move file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${tolven.security.credentials.dir}/db" overwrite="true" /> ! <replace file="${tolven.security.openssl.db.dir}/temp-pgserver.password" token="Encoded password: " value=""/> ! <loadfile property="hashed-pgserver.password" srcFile="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> ! <delete dir="${tolven.security.openssl.db.dir}" /> ! <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> --- 96,103 ---- <arg value="${tolven.security.openssl.db.dir}/pgserver.password" /> </java> <copy file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" /> <move file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${tolven.security.credentials.dir}/db" overwrite="true" /> ! <echo message="pgserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> ! <echo message="A copy of pgserver.password is located in ${tolven.security.credentials.dir}/db" /> <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> *************** *** 92,96 **** </fileset> </copy> ! <echo message="pgserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> <echo message="The hashed db password in login-config.xml was created using org.jboss.security.plugins.PBEUtils" /> <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > --- 105,109 ---- </fileset> </copy> ! <echo message="The hashed ldap password in login-config.xml was created using org.jboss.security.plugins.PBEUtils" /> <echo message="The hashed db password in login-config.xml was created using org.jboss.security.plugins.PBEUtils" /> <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > *************** *** 125,130 **** </fileset> </copy> - <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> - <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> --- 138,141 ---- *************** *** 225,228 **** --- 236,275 ---- <target name="init-external-dependencies"> + <!-- Set up filter properties for the called ant targets --> + <!-- org.jboss.security.plugins.PBEUtils outputs the literal string "Encoded password: ", followed by the required hashed password, so some effort is required to remove the literal string --> + <!-- Create the ldapserver.password file. Create the filter for the template login-config.xml with the hashed versioned of the password --> + <!-- Update tolven-ldap-service.xml with the salt and iterations --> + <fail unless="tolven.security.ldap.salt" /> + <fail unless="tolven.security.ldap.iterations" /> + <input message="Please enter the ldap password to be hashed" addproperty="tolven.ldap.password" /> + <input message="Please enter a keystore password to protect the ldap password" addproperty="tolven.ldap.keystore.password" /> + <delete file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> + <mkdir dir="${tolven.security.openssl.ldap.dir}"/> + <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password" failonerror="true"> + <arg value="${tolven.security.ldap.salt}" /> + <arg value="${tolven.security.ldap.iterations}" /> + <arg value="${tolven.ldap.keystore.password}" /> + <arg value="${tolven.ldap.password}" /> + </java> + <replace file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password" token="Encoded password: " value=""/> + <loadfile property="hashed-ldapserver.password" srcFile="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> + <delete file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> + + <fail unless="tolven.security.db.salt" /> + <fail unless="tolven.security.db.iterations" /> + <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> + <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> + <delete file="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> + <mkdir dir="${tolven.security.openssl.db.dir}"/> + <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.db.dir}/temp-pgserver.password" failonerror="true"> + <arg value="${tolven.security.db.salt}" /> + <arg value="${tolven.security.db.iterations}" /> + <arg value="${tolven.database.keystore.password}" /> + <arg value="${tolven.database.password}" /> + </java> + <replace file="${tolven.security.openssl.db.dir}/temp-pgserver.password" token="Encoded password: " value=""/> + <loadfile property="hashed-pgserver.password" srcFile="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> + <delete file="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> + <ant target="jbossInit"/> <ant target="databaseInit"/> |
|
From: Joseph I. <jos...@us...> - 2006-08-20 22:45:24
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv847/jboss-config Modified Files: tolven-ldap-service.xml login-config.xml Log Message: Removed the password from tolven-ldap-service.xml to ldapserver.password, which exists in the ${deploy.location}/conf and its corresponding hashed value is located in login-config.xml under the tolvenApplicationLDAP SecurityDomain Index: login-config.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/login-config.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** login-config.xml 15 Aug 2006 07:00:39 -0000 1.6 --- login-config.xml 20 Aug 2006 22:45:22 -0000 1.7 *************** *** 53,56 **** --- 53,67 ---- </application-policy> + <application-policy name="tolvenApplicationLDAP"> + <authentication> + <login-module code="org.jboss.resource.security.JaasSecurityDomainIdentityLoginModule" + flag = "required"> + <module-option name = "username">cn=Manager,dc=tolven,dc=com</module-option> + <module-option name = "password">@hashed-ldapserver-password@</module-option> + <module-option name = "jaasSecurityDomain">jboss.security:service=TolvenSecurityDomain,domain=tolvenApplicationLDAP</module-option> + </login-module> + </authentication> + </application-policy> + <application-policy name="tolvenLDAP"> <authentication> Index: tolven-ldap-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/tolven-ldap-service.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tolven-ldap-service.xml 13 Aug 2006 19:12:28 -0000 1.4 --- tolven-ldap-service.xml 20 Aug 2006 22:45:22 -0000 1.5 *************** *** 17,23 **** --- 17,36 ---- javax.naming.ldap.InitialLdapContext </attribute> + <security-domain>tolvenApplicationLDAP</security-domain> <depends>jboss:type=Service,name=TolvenSystemProperties</depends> </mbean> + <mbean code="org.jboss.security.plugins.JaasSecurityDomain" + name="jboss.security:service=TolvenSecurityDomain,domain=tolvenApplicationLDAP"> + <constructor> + <arg type="java.lang.String" value="tolvenApplicationLDAP" /> + </constructor> + <attribute name="KeyStorePass"> + {CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/conf/ldapserver.password + </attribute> + <attribute name="Salt">@tolven-ldap-salt@</attribute> + <attribute name="IterationCount">@tolven-ldap-iterations@</attribute> + </mbean> + </server> |
|
From: Joseph I. <jos...@us...> - 2006-08-20 22:45:24
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv847/template Modified Files: ant-build.template Log Message: Removed the password from tolven-ldap-service.xml to ldapserver.password, which exists in the ${deploy.location}/conf and its corresponding hashed value is located in login-config.xml under the tolvenApplicationLDAP SecurityDomain Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ant-build.template 20 Aug 2006 07:58:46 -0000 1.35 --- ant-build.template 20 Aug 2006 22:45:22 -0000 1.36 *************** *** 21,25 **** # Properties for hashing the database password...the actual password will be asked for during jbossInit ! # I believe tolven.security.db.salt has a lower limit of eight characters (less and there's an error) tolven.security.db.salt=abcdefgh tolven.security.db.iterations=13 --- 21,27 ---- # Properties for hashing the database password...the actual password will be asked for during jbossInit ! # I believe tolven.security.db.salt and tolven.security.dlap.salt have a lower limit of eight characters (less and there's an error) ! tolven.security.ldap.salt=hgfedcba ! tolven.security.ldap.iterations=13 tolven.security.db.salt=abcdefgh tolven.security.db.iterations=13 |
|
From: Joseph I. <jos...@us...> - 2006-08-20 07:58:50
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1199/template Modified Files: ant-build.template Log Message: Automatically copy ldap and pg certificates to eithera local or remote servers Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ant-build.template 20 Aug 2006 02:54:15 -0000 1.34 --- ant-build.template 20 Aug 2006 07:58:46 -0000 1.35 *************** *** 9,12 **** --- 9,15 ---- jdbc.host=localhost jdbc.username=postgres + # For copying credentials to a remoted host the following two properties must be set to avoid being asked for input + # ldap.host.user=someldapuser + # postgres.host.user=somepguser # Where you want to deploy the Tolven EAR file |
|
From: Joseph I. <jos...@us...> - 2006-08-20 07:58:50
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1199/security-config Modified Files: build.xml Log Message: Automatically copy ldap and pg certificates to eithera local or remote servers Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 20 Aug 2006 02:48:13 -0000 1.23 --- build.xml 20 Aug 2006 07:58:46 -0000 1.24 *************** *** 364,384 **** <target name="ldapInit" description="Initialize LDAP for Tolven" depends="required-properties"> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.security.credentials.dir}/ldap /"> ! <include name="tolvendev-ldap-cert.pem"/> ! <include name="tolvendev-ldap-key.pem"/> ! <include name="tolvendev-ldap-cacerts.pem"/> ! </fileset> ! </copy> </target> <target name="databaseInit" description="Initialize Postgres for Tolven" depends="required-properties"> ! <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.security.credentials.dir}/db"> ! <include name="server.crt"/> ! <include name="server.key"/> ! <include name="root.crt"/> ! </fileset> ! </copy> </target> --- 364,378 ---- <target name="ldapInit" description="Initialize LDAP for Tolven" depends="required-properties"> ! <condition property="ldap-copy-target" value="copy-certs-to-localhost-ldap" else="copy-certs-to-remote-ldap"> ! <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> ! </condition> ! <ant target="${ldap-copy-target}" /> </target> <target name="databaseInit" description="Initialize Postgres for Tolven" depends="required-properties"> ! <condition property="pg-copy-target" value="copy-certs-to-localhost-pg" else="copy-certs-to-remote-pg"> ! <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> ! </condition> ! <ant target="${pg-copy-target}" /> </target> *************** *** 399,401 **** --- 393,445 ---- </target> + <target name="copy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> + <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.security.credentials.dir}/ldap"> + <include name="tolvendev-ldap-cert.pem"/> + <include name="tolvendev-ldap-key.pem"/> + <include name="tolvendev-ldap-cacerts.pem"/> + </fileset> + </copy> + </target> + + <target name="copy-certs-to-remote-ldap" description="Copy certificates to remote LDAP for Tolven"> + <fail unless="ldap.host" /> + <fail unless="ldap.location" /> + <input message="To copy certificates, please enter username for remote LDAP host: ${ldap.host} (ldap.host.user can be set in the ant properties file)" addproperty="ldap.host.user" /> + <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> + <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> + <fileset dir="${tolven.security.credentials.dir}/ldap"> + <include name="tolvendev-ldap-cert.pem"/> + <include name="tolvendev-ldap-key.pem"/> + <include name="tolvendev-ldap-cacerts.pem"/> + </fileset> + </scp> + <echo level="info" message="tolvendev-ldap-cert.pem, tolvendev-ldap-key.pem and tolvendev-ldap-cacerts.pem have been copied to ${ldap.host}:${ldap.location}" /> + </target> + + <target name="copy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> + <copy toDir="${postgres.location}" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.security.credentials.dir}/db"> + <include name="server.crt"/> + <include name="server.key"/> + <include name="root.crt"/> + </fileset> + </copy> + </target> + + <target name="copy-certs-to-remote-pg" description="Copy certificates to remote Postgres for Tolven" depends="required-properties"> + <fail unless="jdbc.host" /> + <fail unless="postgres.location" /> + <input message="To copy certificates, please enter username for remote Postgres host: ${jdbc.host} (postgres.host.user can be set in the ant properties file)" addproperty="postgres.host.user" /> + <input message="To copy over certificates, please enter user password for remote Posgres host: ${jdbc.host}" addproperty="tolven.pg.host.password" /> + <scp todir="${postgres.host.user}@${jdbc.host}:${postgres.location}" password="${tolven.pg.host.password}" trust="true" failonerror="true"> + <fileset dir="${tolven.security.credentials.dir}/db"> + <include name="server.crt"/> + <include name="server.key"/> + <include name="root.crt"/> + </fileset> + </scp> + <echo level="info" message="tolvendev-pg-cert.pem, tolvendev-pg-key.pem and tolvendev-pg-cacerts.pem have been copied to ${jdbc.host}:${postgres.location}" /> + </target> + </project> |
|
From: John C. <jc...@us...> - 2006-08-20 06:49:48
|
Update of /cvsroot/tolven/tolvenWEB/web/five/test In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7414/web/five/test Modified Files: genPerson.xhtml Log Message: Explain how this works on the html page itself Index: genPerson.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/test/genPerson.xhtml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** genPerson.xhtml 7 Aug 2006 03:23:15 -0000 1.4 --- genPerson.xhtml 20 Aug 2006 06:49:45 -0000 1.5 *************** *** 71,76 **** </div> <p>Generating people also generates families based on the people generated. The family generator starts with ! adult females, finds them a mate, gives them the same last name, and then looks for children. ! </p> <h:form id="genPeople" onsubmit="return ajaxSubmit2(this);"> <h:panelGrid columns="3"> --- 71,80 ---- </div> <p>Generating people also generates families based on the people generated. The family generator starts with ! adult females, finds them a mate if possible, gives them the same last name, and then looks for children. Select the Family menu to see ! resulting menus. Click the [refresh] link below to refresh just this panewithout disturbing other panes/tabs.</p> ! <p>This is a global list of people not associated with a particular user or account. It is used to demonstrate scrolling performance and to show what ! people created by the generator look like. ! There are currently #{gen.personCount} people in the list.</p> ! <p>People are generated while you wait but you can do other things while it is working.</p> <h:form id="genPeople" onsubmit="return ajaxSubmit2(this);"> <h:panelGrid columns="3"> |
3 messages has been excluded from this view by a project administrator.
