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-10-14 20:24:39
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22512/web/WEB-INF Modified Files: faces-config.xml Log Message: Fix bug 1576314 Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** faces-config.xml 14 Oct 2006 20:15:52 -0000 1.19 --- faces-config.xml 14 Oct 2006 20:24:37 -0000 1.20 *************** *** 124,128 **** <from-action>#{menu.updateMenus}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/portal3.xhtml</to-view-id> <redirect/> </navigation-case> --- 124,128 ---- <from-action>#{menu.updateMenus}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> <redirect/> </navigation-case> *************** *** 320,356 **** </navigation-rule> <navigation-rule> - <from-view-id>/private/portal3.xhtml</from-view-id> - <navigation-case> - <from-outcome>loggedOut</from-outcome> - <to-view-id>/loggedOut.xhtml</to-view-id> - <redirect/> - </navigation-case> - <navigation-case> - <from-action>#{reg.updatePrefs}</from-action> - <to-view-id>/tab/prefDemog.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{gen.generatePeople}</from-action> - <from-outcome>success</from-outcome> - <to-view-id>/five/test/genPerson.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{gen.newUser}</from-action> - <from-outcome>success</from-outcome> - <to-view-id>/tab/genNewUser.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{reg.search}</from-action> - <from-outcome>success</from-outcome> - <to-view-id>/tab/testLdap.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-action>#{doc.create}</from-action> - <from-outcome>success</from-outcome> - <to-view-id>/tab/testDoc.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - - <navigation-rule> <from-view-id>/public/register.xhtml</from-view-id> <navigation-case> --- 320,323 ---- |
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18744/web/private Modified Files: selectAccount.xhtml ephr.xhtml adminAccount.xhtml prefPhotos.xhtml userDemog.xhtml customize.xhtml echr.xhtml Log Message: Add sponsorship and clean up navication around adminn and selectaccount pages. Index: echr.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/echr.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** echr.xhtml 2 Oct 2006 05:29:59 -0000 1.1 --- echr.xhtml 14 Oct 2006 20:15:51 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> + <ui:param name="skin" value="echr"/> <ui:param name="initialPage" value="echr"/> <ui:param name="brand" value="brandc"/> Index: prefPhotos.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/prefPhotos.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** prefPhotos.xhtml 31 Aug 2006 05:20:09 -0000 1.3 --- prefPhotos.xhtml 14 Oct 2006 20:15:51 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> + <ui:param name="skin" value="#{reg.account.knownType}"/> <ui:define name="content"> <div> Index: customize.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/customize.xhtml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** customize.xhtml 2 Oct 2006 05:29:59 -0000 1.3 --- customize.xhtml 14 Oct 2006 20:15:51 -0000 1.4 *************** *** 11,15 **** <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="initialPage" value="#{reg.account.knownType}"/> <ui:define name="content"> <h3>Advanced menu customization</h3> --- 11,15 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="skin" value="#{reg.account.knownType}"/> <ui:define name="content"> <h3>Advanced menu customization</h3> Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** selectAccount.xhtml 3 Oct 2006 04:41:05 -0000 1.10 --- selectAccount.xhtml 14 Oct 2006 20:15:51 -0000 1.11 *************** *** 12,20 **** <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="brand" value="brandt"/> ! <ui:param name="initialPage" value="echr"/> <ui:define name="content"> <div id="paneArea" class="pane"> <h:form id="accountForm" > ! <h:panelGroup rendered="#{invitation.openInvitationCount!=0}"> <h2>You have the following Invitations</h2> <h:dataTable id="invites" value="#{invitation.openInvitations}" --- 12,31 ---- <ui:composition template="../templates/portalTemplate.xhtml"> <ui:param name="brand" value="brandt"/> ! <ui:param name="skin" value="echr"/> <ui:define name="content"> <div id="paneArea" class="pane"> <h:form id="accountForm" > ! <c:if test="#{top.accountUserId!=0}"> ! <h:commandLink id="continue" action="#{top.postLogin}" value="Continue"/> ! <script language="JavaScript" type="text/javascript"> ! // <![CDATA[ ! window.onload=function() { ! $('accountForm:continue').click(); ! } ! // ]]> ! </script> ! </c:if> ! <c:if test="#{top.accountUserId==0}"> ! <h:panelGroup rendered="#{invitation.openInvitationCount!=0}"> <h2>You have the following Invitations</h2> <h:dataTable id="invites" value="#{invitation.openInvitations}" *************** *** 43,47 **** <h2>Select the account you would like to log into</h2> <h:selectBooleanCheckbox value="#{top.rememberDefault}"/> ! <h:outputText value="Remember my choice below and go there directly next time I login"/> <h:dataTable id="accounts" value="#{acc.accountUsers}" var="item" border="1" cellspacing="0"> --- 54,58 ---- <h2>Select the account you would like to log into</h2> <h:selectBooleanCheckbox value="#{top.rememberDefault}"/> ! <h:outputText value="Remember my choice below and go there directly the next time I login"/> <h:dataTable id="accounts" value="#{acc.accountUsers}" var="item" border="1" cellspacing="0"> *************** *** 102,108 **** Some people will just have one user and one medical record, their own, in an account.</p> </h:panelGroup> </h:form> </div> ! </ui:define> </ui:composition> </body> --- 113,120 ---- Some people will just have one user and one medical record, their own, in an account.</p> </h:panelGroup> + </c:if> </h:form> </div> ! </ui:define> </ui:composition> </body> Index: userDemog.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/userDemog.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** userDemog.xhtml 2 Oct 2006 05:29:59 -0000 1.5 --- userDemog.xhtml 14 Oct 2006 20:15:51 -0000 1.6 *************** *** 12,16 **** <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="initialPage" value="#{reg.account.knownType}"/> <ui:define name="content"> <h3>User Preferences</h3> --- 12,16 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="skin" value="#{reg.account.knownType}"/> <ui:define name="content"> <h3>User Preferences</h3> *************** *** 63,75 **** </h:panelGrid> </h:form> ! <h3>You are logged into account #{reg.account.id} #{reg.account.title}</h3> ! <h:panelGrid columns="1"> ! <h:panelGroup > ! <h:outputLink value="adminAccount.jsf"> ! <h:outputText value="Administer this account"/> ! </h:outputLink> ! </h:panelGroup> ! </h:panelGrid> ! <h3>Photo</h3> <h:form> <h:panelGroup rendered="#{reg.user.likeness!=null}"> --- 63,67 ---- </h:panelGrid> </h:form> ! <h3>Photo</h3> <h:form> <h:panelGroup rendered="#{reg.user.likeness!=null}"> *************** *** 85,88 **** --- 77,81 ---- </h:panelGroup> </h:form> + <h3>You are logged into account #{reg.account.id} #{reg.account.title}</h3> <h3>All accounts you are a member of</h3> <h:dataTable value="#{reg.userAccounts}" var="au"> Index: adminAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/adminAccount.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** adminAccount.xhtml 3 Oct 2006 04:41:05 -0000 1.5 --- adminAccount.xhtml 14 Oct 2006 20:15:51 -0000 1.6 *************** *** 12,16 **** <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="initialPage" value="#{reg.account.knownType}"/> <ui:define name="content"> <h3>Account #{reg.account.id} #{reg.account.title}</h3> --- 12,16 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> ! <ui:param name="skin" value="echr"/> <ui:define name="content"> <h3>Account #{reg.account.id} #{reg.account.title}</h3> *************** *** 30,34 **** <h:outputText value="#{top.timeZone}" /> </h:panelGrid> ! <h:dataTable value="#{reg.accountUsers}" var="au" styleClass="activity"> <!--h:column> --- 30,36 ---- <h:outputText value="#{top.timeZone}" /> </h:panelGrid> ! <h:commandButton action="cancel" immediate="true" value="Cancel"/> ! <h:commandButton action="#{reg.updateAccount}" value="Update"/> ! <h3>List of users allowed to login to this account</h3> <h:dataTable value="#{reg.accountUsers}" var="au" styleClass="activity"> <!--h:column> *************** *** 84,97 **** </h:column> </h:dataTable> ! <h:commandButton action="cancel" immediate="true" value="Cancel"/> ! <h:commandButton action="#{reg.updateAccount}" value="Update"/> ! </h:form> ! <h:form id="newDemoUser" rendered="#{reg.user.demoUser}"> ! <h:panelGrid columns="3" > <h:outputText value="Add existing demo user to this account"/> <h:inputText id="uid" value="#{reg.newDemoUser}" size="20"/> <h:commandButton action="#{reg.addDemoUser}" value="Add"/> </h:panelGrid> </h:form> <h:panelGroup rendered="#{reg.account.knownType=='echr'}"> <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3> --- 86,119 ---- </h:column> </h:dataTable> ! <h:panelGrid columns="3" rendered="#{reg.user.demoUser}"> <h:outputText value="Add existing demo user to this account"/> <h:inputText id="uid" value="#{reg.newDemoUser}" size="20"/> <h:commandButton action="#{reg.addDemoUser}" value="Add"/> </h:panelGrid> + <h:messages for="uid" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> + <h3>Account sponsorships</h3> + <p>Create a sponsorship and hand out the id to allow people to register for an account. People using this reference code will not be added to this account. However, + we will keep track of all of the users that ultimately use this reference code.</p> + <h:dataTable value="#{reg.sponsorships}" var="sp" styleClass="activity"> + <h:column> + <f:facet name="header"> + <h:outputText value="Title"/> + </f:facet> + <h:outputText value="#{sp.title}"/> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Reference Code"/> + </f:facet> + <h:outputText value="#{sp.referenceCode}" /> + </h:column> + </h:dataTable> + <h:panelGrid columns="2" > + <h:inputText id="sponsorTitle" value="#{reg.sponsorshipTitle}" size="50"/> + <h:commandButton action="#{reg.addSponsorship}" value="Add Sponsorship"/> + </h:panelGrid> + <h:messages for="sponsorTitle" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:form> + <h:panelGroup rendered="#{reg.account.knownType=='echr'}"> <h3>Generate virtual patients into this account (#{reg.account.id}, #{reg.account.title})</h3> *************** *** 118,122 **** <h:commandButton id="patGenAction" action="#{gen.createCHRPatients}" value="Generate Patients"/> </h:form> - <h:messages globalOnly="true" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> </h:panelGroup> </ui:define> --- 140,143 ---- Index: ephr.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/ephr.xhtml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ephr.xhtml 2 Oct 2006 05:29:59 -0000 1.1 --- ephr.xhtml 14 Oct 2006 20:15:51 -0000 1.2 *************** *** 11,14 **** --- 11,15 ---- <body> <ui:composition template="../templates/portalTemplate.xhtml"> + <ui:param name="skin" value="ephr"/> <ui:param name="initialPage" value="ephr"/> <ui:param name="brand" value="brandp"/> |
|
From: John C. <jc...@us...> - 2006-10-14 20:15:54
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18744/src/org/tolven/web Modified Files: RegisterAction.java Log Message: Add sponsorship and clean up navication around adminn and selectaccount pages. Index: RegisterAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/RegisterAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** RegisterAction.java 3 Oct 2006 04:41:05 -0000 1.17 --- RegisterAction.java 14 Oct 2006 20:15:52 -0000 1.18 *************** *** 25,28 **** --- 25,29 ---- import javax.naming.InitialContext; import javax.naming.NamingException; + import javax.persistence.NoResultException; import org.apache.commons.fileupload.FileItem; *************** *** 35,38 **** --- 36,40 ---- import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountUser; + import org.tolven.core.entity.Sponsorship; import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentLocal; *************** *** 74,77 **** --- 76,82 ---- private boolean noActivation; + private Boolean referenceRequired; + private String sponsorshipTitle; + private List<Sponsorship> sponsorships; private FileItem likenessFile; *************** *** 204,208 **** // Option to register with activation or without - for demo if (this.isNoActivation()) { ! activation.registerAndActivate( tp, getNow() ); returnStatus = "activated"; } else { --- 209,223 ---- // Option to register with activation or without - for demo if (this.isNoActivation()) { ! try { ! activation.registerAndActivate( tp, getNow() ); ! } catch (Throwable e) { ! while (e.getCause()!=null) { ! if (e.getCause() instanceof NoResultException ) { ! FacesContext.getCurrentInstance().addMessage( "register:referenceCode", new FacesMessage("Invalid Reference Code")); ! return "error"; ! } ! e = e.getCause(); ! } ! } returnStatus = "activated"; } else { *************** *** 245,249 **** getTp().addMail( getRepeatUid() ); String returnStatus = null; ! activation.registerAndActivate( tp, getNow() ); returnStatus = "activated"; // As soon as the user get's established, we'll allow them to create a new account using a --- 260,276 ---- getTp().addMail( getRepeatUid() ); String returnStatus = null; ! try { ! activation.registerAndActivate( tp, getNow() ); ! } catch (Exception e) { ! Throwable ex = e; ! while (ex.getCause()!=null) { ! if (ex.getCause() instanceof NoResultException ) { ! FacesContext.getCurrentInstance().addMessage( "register:referenceCode", new FacesMessage("Invalid Reference Code")); ! return "error"; ! } ! ex = ex.getCause(); ! } ! throw e; ! } returnStatus = "activated"; // As soon as the user get's established, we'll allow them to create a new account using a *************** *** 511,519 **** TolvenUser user = accountBean.findUser(uid); if (user==null) { ! FacesContext.getCurrentInstance().addMessage( null, new FacesMessage("Demo user " + uid + " not found")); return "fail"; } AccountUser accountUser = accountBean.addAccountUser(getAccount(), user, getNow(), false ); ! FacesContext.getCurrentInstance().addMessage( null, new FacesMessage("Demo user " + uid + " added, id: " + accountUser.getUser().getId())); return "success"; } --- 538,564 ---- TolvenUser user = accountBean.findUser(uid); if (user==null) { ! FacesContext.getCurrentInstance().addMessage( "accountAdmin:uid", new FacesMessage("Demo user " + uid + " not found")); return "fail"; } AccountUser accountUser = accountBean.addAccountUser(getAccount(), user, getNow(), false ); ! FacesContext.getCurrentInstance().addMessage( "accountAdmin:uid", new FacesMessage("Demo user " + uid + " added, id: " + accountUser.getUser().getId())); ! // force a refresh of the list ! accountUsers = null; ! return "success"; ! } ! ! public List<Sponsorship> getSponsorships() throws NamingException, IOException { ! if (sponsorships==null) sponsorships = accountBean.findAccountSponsorships( getAccount() ); ! return sponsorships; ! } ! ! /** ! * Add a new sponsorship to this account. ! * @return ! */ ! public String addSponsorship( ) { ! accountBean.createSponsorship(getAccount(), getSponsorshipTitle()); ! // force a requery of the sponsorships ! sponsorships = null; return "success"; } *************** *** 554,556 **** --- 599,617 ---- this.ephr = ephr; } + + public boolean isReferenceRequired() throws IOException { + if (referenceRequired==null) { + referenceRequired = Boolean.parseBoolean(propertyBean.getProperties().getProperty("tolven.register.referenceRequired")); + } + return referenceRequired; + } + + public String getSponsorshipTitle() { + return sponsorshipTitle; + } + + public void setSponsorshipTitle(String sponsorshipTitle) { + this.sponsorshipTitle = sponsorshipTitle; + } + } |
|
From: John C. <jc...@us...> - 2006-10-14 20:15:54
|
Update of /cvsroot/tolven/tolvenWEB/web/templates In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18744/web/templates Modified Files: portalTemplate.xhtml Log Message: Add sponsorship and clean up navication around adminn and selectaccount pages. Index: portalTemplate.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/templates/portalTemplate.xhtml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** portalTemplate.xhtml 2 Oct 2006 05:29:59 -0000 1.10 --- portalTemplate.xhtml 14 Oct 2006 20:15:52 -0000 1.11 *************** *** 10,14 **** <title>Tolven Portal</title> <link ! href="#{facesContext.externalContext.request.contextPath}/styles/#{initialPage}.css" type="text/css" rel="stylesheet" /> <script language="JavaScript" type="text/javascript" --- 10,14 ---- <title>Tolven Portal</title> <link ! href="#{facesContext.externalContext.request.contextPath}/styles/#{skin}.css" type="text/css" rel="stylesheet" /> <script language="JavaScript" type="text/javascript" |
|
From: John C. <jc...@us...> - 2006-10-14 20:15:54
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18744/web/WEB-INF Modified Files: faces-config.xml Log Message: Add sponsorship and clean up navication around adminn and selectaccount pages. Index: faces-config.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/faces-config.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** faces-config.xml 2 Oct 2006 05:30:00 -0000 1.18 --- faces-config.xml 14 Oct 2006 20:15:52 -0000 1.19 *************** *** 154,161 **** <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> --- 154,166 ---- <from-action>#{reg.updateAccount}</from-action> <from-outcome>success</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> <redirect/> </navigation-case> <navigation-case> + <from-action>#{reg.addSponsorship}</from-action> + <from-outcome>success</from-outcome> + <to-view-id>/private/adminAccount.xhtml</to-view-id> + </navigation-case> + <navigation-case> <from-action>#{reg.addDemoUser}</from-action> <from-outcome>success</from-outcome> *************** *** 164,168 **** <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/private/userDemog.xhtml</to-view-id> </navigation-case> <navigation-case> --- 169,173 ---- <navigation-case> <from-outcome>cancel</from-outcome> ! <to-view-id>/private/selectAccount.xhtml</to-view-id> </navigation-case> <navigation-case> |
|
From: John C. <jc...@us...> - 2006-10-14 20:15:53
|
Update of /cvsroot/tolven/tolvenWEB/web/public In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18744/web/public Modified Files: newDemoUser.xhtml register.xhtml Log Message: Add sponsorship and clean up navication around adminn and selectaccount pages. Index: register.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/register.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** register.xhtml 3 Sep 2006 07:06:15 -0000 1.5 --- register.xhtml 14 Oct 2006 20:15:51 -0000 1.6 *************** *** 22,25 **** --- 22,30 ---- <h:form id="register"> <h:panelGrid columns="2"> + <h:outputText value="reference Code" rendered="#{reg.referenceRequired}"/> + <h:panelGroup rendered="#{reg.referenceRequired}"> + <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> + <h:message for="referenceCode" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> + </h:panelGroup> <h:outputText value="First Name"/> <h:panelGroup> *************** *** 56,59 **** --- 61,67 ---- login with the username (email address) and password you entered here. </p> + <h:panelGroup rendered="#{reg.referenceRequired}"> + <p>A reference code is required to login.</p> + </h:panelGroup> <h:commandButton action="cancel" value="Cancel" immediate="true"/> <h:commandButton action="#{reg.register}" value="Register"/> Index: newDemoUser.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/public/newDemoUser.xhtml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newDemoUser.xhtml 2 Oct 2006 05:29:59 -0000 1.2 --- newDemoUser.xhtml 14 Oct 2006 20:15:51 -0000 1.3 *************** *** 22,25 **** --- 22,30 ---- <h:form id="register"> <h:panelGrid columns="2"> + <h:outputText value="reference Code" rendered="#{reg.referenceRequired}"/> + <h:panelGroup rendered="#{reg.referenceRequired}"> + <h:inputText id="referenceCode" value="#{reg.tp.referenceCode}" size="10" required="true"/> + <h:message for="referenceCode" errorClass="errorMsg" infoClass="infoMsg" warnClass="warnMsg" fatalClass="fatalMsg"/> + </h:panelGroup> <h:outputText value="First Name"/> <h:panelGroup> *************** *** 57,60 **** --- 62,68 ---- <h:outputText value="Create a new clinical health record account"/> </h:panelGrid> + <h:panelGroup rendered="#{reg.referenceRequired}"> + <p>A reference code is required to login.</p> + </h:panelGroup> <p>When you click Activate, you will be returned to the login page where you can login by entering your user id and password.</p> |
|
From: John C. <jc...@us...> - 2006-10-14 20:14:40
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18279/src/org/tolven/web Modified Files: TopAction.java Log Message: Do not allow accountSelection for a user who has already selected an account. Index: TopAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/TopAction.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TopAction.java 2 Oct 2006 05:29:59 -0000 1.15 --- TopAction.java 14 Oct 2006 20:14:38 -0000 1.16 *************** *** 155,160 **** --- 155,167 ---- * of a registration process. If there was no accompanying RSVP to complete the activation, then we need to * log the user out and ask them to wait for their eMail to come through.</p> + * <p>If the user has already selected an account, don't allow any further changes. Just dispatch to the + * main page. To change accounts, the user must re-authenticate which means login again. This is a security feature.</p> */ public String postLogin() throws Exception{ + AccountUser accountUser = null; + if (accountUserId!=0) { + accountUser = activation.findAccountUser(accountUserId ); + return accountUser.getAccount().getKnownType(); + } String principal = FacesContext.getCurrentInstance().getExternalContext().getUserPrincipal().getName(); info = "Login Processing: " + principal; *************** *** 176,180 **** } ! // If user still not logged in, send them packing if (getUser()==null) { // It appears that Faces doesn't allow a message to persist beyond a session invalidate so, instead, --- 183,187 ---- } ! // If user still not logged in, send them packing, we've got a problem if (getUser()==null) { // It appears that Faces doesn't allow a message to persist beyond a session invalidate so, instead, *************** *** 185,189 **** accountUserId = getRequestParameterAsLong( "accountUserId" ); - AccountUser accountUser = null; // Otherwise, we dispatch based on the defaultAccount or the one the user selected. if (accountUserId!=0) { --- 192,195 ---- |
|
From: John C. <jc...@us...> - 2006-10-14 20:13:38
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/security In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17848/src/org/tolven/security Modified Files: TolvenPerson.java Log Message: Add sponsorship, reference code Index: TolvenPerson.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/security/TolvenPerson.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TolvenPerson.java 21 Aug 2006 00:26:29 -0000 1.4 --- TolvenPerson.java 14 Oct 2006 20:13:35 -0000 1.5 *************** *** 44,47 **** --- 44,48 ---- private List<String> mail; // eMail address(es) private String jpegPhoto; // Photo + private String referenceCode; // When needed /** *************** *** 270,272 **** --- 271,289 ---- } + public String getReferenceCode() { + return referenceCode; + } + + /** + * Set the reference code, but make sure it's trimmed and lowercase and zero length changed to null + * @param referenceCode + */ + public void setReferenceCode(String referenceCode) { + if (referenceCode==null) this.referenceCode = null; + else { + this.referenceCode = referenceCode.trim().toLowerCase(); + if (this.referenceCode.length()==0) this.referenceCode = null; + } + } + } |
|
From: John C. <jc...@us...> - 2006-10-14 20:13:37
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17848/src/org/tolven/core/bean Modified Files: AccountDAOBean.java ActivationBean.java TolvenProperties.java Log Message: Add sponsorship, reference code Index: TolvenProperties.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/TolvenProperties.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TolvenProperties.java 3 Sep 2006 07:04:52 -0000 1.5 --- TolvenProperties.java 14 Oct 2006 20:13:35 -0000 1.6 *************** *** 54,57 **** --- 54,58 ---- defProps.put("tolven.login.create.demoUser","true"); defProps.put("tolven.login.create.activatedUser","true"); + defProps.put("tolven.register.referenceRequired","false"); // Now create the one everyone sees props = new Properties(defProps); Index: AccountDAOBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/AccountDAOBean.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccountDAOBean.java 21 Aug 2006 00:26:29 -0000 1.4 --- AccountDAOBean.java 14 Oct 2006 20:13:35 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountType; + import org.tolven.core.entity.Sponsorship; import org.tolven.core.entity.TolvenUser; import org.tolven.core.entity.AccountUser; *************** *** 39,43 **** private EntityManager em; ! /** * Create a new account. No users are associated with this account. * @param accountType --- 40,57 ---- private EntityManager em; ! public static String alphabet = "ab2c3d4e5f6g7h8j9kmnprstuvwxy"; ! ! public static String generateSponsorReferenceCode( long n) { ! StringBuffer sb = new StringBuffer( 20 ); ! n = ((n+1) * 17) + (n * 3) + n; ! while (n > 0) { ! long r = n % (long)alphabet.length(); ! sb.append(alphabet.charAt((int)r)); ! n = n / alphabet.length(); ! } ! return sb.toString(); ! } ! ! /** * Create a new account. No users are associated with this account. * @param accountType *************** *** 103,107 **** return au; } - } --- 117,162 ---- return au; } + /** + * Create a new sponsorship for the given account. + */ + public Sponsorship createSponsorship( Account account, String title) { + Sponsorship sponsorship = new Sponsorship( ); + sponsorship.setAccount(account); + sponsorship.setTitle(title); + // ID needs to be generated before creating the reference code so persist THEN setReferenceCode + em.persist( sponsorship ); + sponsorship.setReferenceCode(generateSponsorReferenceCode( sponsorship.getId() )); + return sponsorship; + } + + /** + * Given what is suspected to be a valid sponsorship reference code, return the Sponsorship + * This method fails loudly (throws an object not found exception) if the reference code is not found. + * This should be sufficient to rollback a transaction intended to create a new user + * with an invalid reference code. + * @throws NoResultException if the referenceCode is not found + * @param referenceCode + * @return + */ + public Sponsorship findSponsorship( String referenceCode ) { + Query q = em.createQuery("SELECT s FROM Sponsorship s WHERE s.referenceCode = :rc"); + q.setParameter("rc", referenceCode); + Sponsorship s = (Sponsorship) q.getSingleResult(); + return s; + } + + + public List<Sponsorship> findAccountSponsorships( Account account ) { + Query q = em.createQuery("SELECT s FROM Sponsorship s WHERE s.account = :account"); + q.setParameter("account", account); + return q.getResultList(); + } + + public List<TolvenUser> findSponsoredUsers( Sponsorship sponsorship ) { + Query q = em.createQuery("SELECT u FROM TolvenUser u WHERE s.sponsorship = :sponsorship"); + q.setParameter("sponsorship", sponsorship); + return q.getResultList(); + } + } Index: ActivationBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/bean/ActivationBean.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ActivationBean.java 3 Sep 2006 01:13:16 -0000 1.15 --- ActivationBean.java 14 Oct 2006 20:13:35 -0000 1.16 *************** *** 39,42 **** --- 39,43 ---- import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.HealthRecord; + import org.tolven.core.entity.Sponsorship; import org.tolven.core.entity.TolvenUser; import org.tolven.doc.DocumentLocal; *************** *** 75,79 **** /** ! * Activate a user. Return false if invitation has expired or logged in user does not match target user of invitation * @param user An existing tolve user to be activated * @param invitation the invitation boolean indicating if this user has account administration permission --- 76,82 ---- /** ! * Activate a user. Return false if invitation has expired or logged in user does not match target user of invitation. ! * While an invitation is marked as used, there is no harm in supplying a used invitation id. ! * This can happen if the user decides to bookmark the URL from an invitaiton eMail. * @param user An existing tolve user to be activated * @param invitation the invitation boolean indicating if this user has account administration permission *************** *** 103,108 **** TolvenUser user = createTolvenUser( principal, now ); user.setDemoUser(false); - // Note: We don't actually check this the next time around. If something goes wrong and the invitation is - // still valid, it's OK to reuse it. But it's nice for keeping track of which are used. invitation.setStatus("USED"); em.merge(invitation); --- 106,109 ---- *************** *** 136,141 **** */ public void register( TolvenPerson tp, Date now ) throws Exception { - // Make the LDAP entry - ldap.addPerson( tp ); // Create an invitation Invitation invitation = new Invitation(); --- 137,140 ---- *************** *** 159,162 **** --- 158,163 ---- // Once sent, the invitation state will be updated to reflect completion. Workflow, man. Workflow. invitationBean.queueInvitation( invitation ); + // Make the LDAP entry + ldap.addPerson( tp ); } *************** *** 170,182 **** public TolvenUser registerAndActivate( TolvenPerson tp, Date now ) throws Exception { // System.out.println( "Registering: " + tp.toString()); - // Make the LDAP entry - ldap.addPerson( tp ); // Create a new user object TolvenUser user = createTolvenUser( tp.getUid(), now ); user.setDemoUser(true); return user; } ! ! /** * Find the user object and mark the last update date in the user object. Technically, * this is really a post-login step since the container has already authenticated the user. --- 171,189 ---- public TolvenUser registerAndActivate( TolvenPerson tp, Date now ) throws Exception { // System.out.println( "Registering: " + tp.toString()); // Create a new user object TolvenUser user = createTolvenUser( tp.getUid(), now ); + String rc = tp.getReferenceCode(); + if (rc!=null) { + Sponsorship sponsorship = accountBean.findSponsorship(rc); + user.setSponsorship(sponsorship); + } user.setDemoUser(true); + // Make the LDAP entry + ldap.addPerson( tp ); return user; } ! ! ! /** * Find the user object and mark the last update date in the user object. Technically, * this is really a post-login step since the container has already authenticated the user. |
|
From: John C. <jc...@us...> - 2006-10-14 20:13:37
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17848/src/org/tolven/core Modified Files: AccountDAOLocal.java Log Message: Add sponsorship, reference code Index: AccountDAOLocal.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/AccountDAOLocal.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccountDAOLocal.java 21 Aug 2006 00:26:29 -0000 1.4 --- AccountDAOLocal.java 14 Oct 2006 20:13:35 -0000 1.5 *************** *** 16,27 **** import java.util.Date; import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountUser; import org.tolven.core.entity.TolvenUser; - - - /** * This is the business interface for AccountDAO enterprise bean. --- 16,28 ---- import java.util.Date; + import java.util.List; + + import javax.persistence.Query; import org.tolven.core.entity.Account; import org.tolven.core.entity.AccountUser; + import org.tolven.core.entity.Sponsorship; import org.tolven.core.entity.TolvenUser; /** * This is the business interface for AccountDAO enterprise bean. *************** *** 59,61 **** --- 60,91 ---- public AccountUser addAccountUser(Account account, TolvenUser user, Date now, boolean accountPermission ); + /** + * Given what is suspected to be a valid sponsorship reference code, return the Sponsorship + * This method fails loudly (throws an object not found exception) if the reference code is not found. + * This should be sufficient to rollback a transaction intended to create a new user + * with an invalid reference code. + * @throws NoResultException if the referenceCode is not found + * @param referenceCode + * @return + */ + public Sponsorship findSponsorship( String referenceCode ); + + /** + * Find the list of Sponsorships owned by the specified account + * @param account + * @return + */ + public List<Sponsorship> findAccountSponsorships( Account account ); + + /** + * Find the list of TolvenUsers referencing the specified Sponsorship + * @param sponsorship + * @return + */ + public List<TolvenUser> findSponsoredUsers( Sponsorship sponsorship ); + + /** + * Create a new sponsorship for the given account. + */ + public Sponsorship createSponsorship( Account account, String title); } |
|
From: John C. <jc...@us...> - 2006-10-14 20:13:37
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17848/src/org/tolven/core/entity Modified Files: AccountUser.java TolvenUser.java Account.java Added Files: Sponsorship.java Log Message: Add sponsorship, reference code --- NEW FILE: Sponsorship.java --- /* * Copyright (C) 2006 Tolven Inc * * This library is free software; you can redistribute it and/or modify it under the terms of * the GNU Lesser General Public License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Lesser General Public License for more details. * * Contact: in...@to... */ package org.tolven.core.entity; import java.io.Serializable; import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; /** * If tolven.register.referenceRequired=true, then new users must provide the referenceCode from * a sponsorship record in order to create a new account. This is not intended as a security feature. * An account administrator can sponsor new users into the system by creating one or more sponsorship * records and distributing the referenceCode to user in whatever way they find appropriate. * This is different from the invitation mechanism which is generally used for targeting specific known * people to become users. Using the sponsorship mechanism generally means the sponsor does not know who the * user is or if it does known the user, it may not known which email account, if any, will be used. * Sponsorship does <b>not</b> mean the user becomes a user of the sponsoring account. * @author John Churin */ @Entity @Table(name = "SPONSORSHIP", schema="core") public class Sponsorship implements Serializable { private static final long serialVersionUID = 1L; @Id @GeneratedValue(strategy=GenerationType.TABLE, generator="CORE_SEQ_GEN") private long id; @ManyToOne private Account account; @Column( name="TITLE", length=50) private String title; @Column( name="REFERENCE_CODE", length=20) private String referenceCode; /** * This ReferenceCode can be supplied to users without the sponsoring account knowing the user id. * @return */ public String getReferenceCode() { return referenceCode; } public void setReferenceCode(String referenceCode) { this.referenceCode = referenceCode; } /** * The account sponsoring this/these users. * @return */ public Account getAccount() { return account; } public void setAccount(Account account) { this.account = account; } public long getId() { return id; } public void setId(long id) { this.id = id; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } } Index: AccountUser.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/AccountUser.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AccountUser.java 21 Aug 2006 00:26:29 -0000 1.4 --- AccountUser.java 14 Oct 2006 20:13:35 -0000 1.5 *************** *** 18,21 **** --- 18,22 ---- import javax.persistence.Column; import javax.persistence.Entity; + import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; *************** *** 42,46 **** @ManyToOne private TolvenUser user; ! @Id @GeneratedValue(strategy=GenerationType.TABLE, generator="CORE_SEQ_GEN") --- 43,47 ---- @ManyToOne private TolvenUser user; ! @Id @GeneratedValue(strategy=GenerationType.TABLE, generator="CORE_SEQ_GEN") Index: TolvenUser.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/TolvenUser.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TolvenUser.java 31 Aug 2006 05:20:03 -0000 1.6 --- TolvenUser.java 14 Oct 2006 20:13:35 -0000 1.7 *************** *** 67,70 **** --- 67,73 ---- private String status; + @ManyToOne(fetch = FetchType.LAZY) + private Sponsorship sponsorship; + @Column( name="TIME_ZONE", length=40) private String timeZone; *************** *** 192,195 **** --- 195,206 ---- this.locale = locale; } + + public Sponsorship getSponsorship() { + return sponsorship; + } + + public void setSponsorship(Sponsorship sponsorship) { + this.sponsorship = sponsorship; + } Index: Account.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/core/entity/Account.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Account.java 31 Aug 2006 05:20:03 -0000 1.7 --- Account.java 14 Oct 2006 20:13:35 -0000 1.8 *************** *** 65,68 **** --- 65,71 ---- private Set<HealthRecord> healthRecords = null; + @OneToMany(mappedBy = "account", cascade=CascadeType.ALL, fetch = FetchType.LAZY) + private Set<Sponsorship> sponsorships = null; + /** * Construct an empty Account or Sub-account. A sub-account should have a non-null Parent Account. Account trees cannot have circular references. *************** *** 195,198 **** --- 198,207 ---- this.timeZone = timeZone; } + public Set<Sponsorship> getSponsorships() { + return sponsorships; + } + public void setSponsorships(Set<Sponsorship> sponsorships) { + this.sponsorships = sponsorships; + } } |
|
From: John C. <jc...@us...> - 2006-10-14 20:12:32
|
Update of /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17442/src/org/tolven/doc/bean Modified Files: DocumentBean.java Log Message: The rest of the JAXB contexts are now loaded in specific DocuBase sub-classes. Index: DocumentBean.java =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/src/org/tolven/doc/bean/DocumentBean.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DocumentBean.java 28 Sep 2006 19:06:01 -0000 1.8 --- DocumentBean.java 14 Oct 2006 20:12:30 -0000 1.9 *************** *** 50,54 **** * for explicit document manipualtion. * In particular, the details of most documents are stored in XML form. This session bean provides methods to marshall and unmarshall ! * that XML into and outof java object trees. * Created Apr 19, 2006 11:41:52 AM * @author John Churin --- 50,54 ---- * for explicit document manipualtion. * In particular, the details of most documents are stored in XML form. This session bean provides methods to marshall and unmarshall ! * that XML into and out of java object trees. * Created Apr 19, 2006 11:41:52 AM * @author John Churin *************** *** 220,225 **** public JAXBContext setupJAXBContext() throws JAXBException { ! if (jc==null) { ! jc = JAXBContext.newInstance( "org.tolven.rim:org.tolven.admin:org.tolven.ccr", DocBase.class.getClassLoader() ); } return jc; --- 220,226 ---- public JAXBContext setupJAXBContext() throws JAXBException { ! if (jc==null) { ! System.out.println( " **************** [DocumentBean]setupJAXBContext **********"); ! jc = JAXBContext.newInstance( "org.tolven.admin", DocBase.class.getClassLoader() ); } return jc; |
|
From: Joseph I. <jos...@us...> - 2006-10-14 03:31:20
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3673/installer/izpack-8.1 Modified Files: tolven-install.xml Log Message: Defaulted owner of postgres certificates to postgres. Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tolven-install.xml 12 Oct 2006 23:52:36 -0000 1.11 --- tolven-install.xml 14 Oct 2006 03:31:16 -0000 1.12 *************** *** 81,84 **** --- 81,85 ---- <variable name="LDAP_ITERATIONS" value="13"/> <variable name="DB_HOST" value="localhost"/> + <variable name="DB_HOST_USER" value="postgres"/> <variable name="DB_PORT" value="5432"/> <variable name="DB_HOST_BROWSABLE" value="true"/> |
|
From: John C. <jc...@us...> - 2006-10-12 23:52:39
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5800/installer/izpack-8.1 Modified Files: installUserInputSpec.xml antActionsSpec.xml tolven-install.xml Log Message: Alpha4 - even more simplified default (three panes) Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** installUserInputSpec.xml 9 Oct 2006 16:11:47 -0000 1.7 --- installUserInputSpec.xml 12 Oct 2006 23:52:36 -0000 1.8 *************** *** 9,15 **** txt="2. If the account specifies a timezone (see Account Administration within preferences), that timezone is used, otherwise..." /> <field type="staticText" align="left" ! txt="3. If the system-wide tolven.properties file has an entry: tolven.timezone, it will be used, otherwise..." /> ! <field type="staticText" align="left" ! txt="4. The timezone of the system hosting the application server will be used." /> <field type="combo" variable="TIMEZONE"> <description align="left" txt="Timezone:" /> --- 9,13 ---- txt="2. If the account specifies a timezone (see Account Administration within preferences), that timezone is used, otherwise..." /> <field type="staticText" align="left" ! txt="the following timzone will be used." /> <field type="combo" variable="TIMEZONE"> <description align="left" txt="Timezone:" /> *************** *** 801,835 **** </panel> <panel order="3"> ! <field type="title" txt="CA Credentials" /> ! <field type="text" variable="CERT_COUNTRY_NAME"> ! <spec txt="Country Name:" size="35" set="US" /> ! </field> ! <field type="text" variable="CERT_STATE_OR_PROVINCE"> ! <spec txt="State or Province:" size="3" set="CA" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_NAME"> ! <spec txt="Organization Name:" size="35" ! set="Tolven Healthcare" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_UNIT_NAME"> ! <spec txt="Organization Unit Name:" size="35" ! set="Tolven Demo" /> ! </field> ! ! <field type="text" variable="CERT_CA_COMMON_NAME"> ! <spec txt="CA Common Name:" size="35" ! set="tolven-demo-ca-host" /> ! </field> ! <field type="rule" variable="CERT_CA_EMAIL"> ! <spec txt="CA Email:" layout="O:12:U @ O:8:40 . A:3:3" ! set="0:tolven-demo-ca-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> ! <validator ! class="com.izforge.izpack.util.RegularExpressionValidator" ! txt="Invalid email address!"> ! <param name="pattern" ! value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> ! </validator> ! </field> <field type="password" variable="ONE_PASSWORD"> <description align="left" --- 799,803 ---- </panel> <panel order="3"> ! <field type="title" txt="Password to use for all credentials" /> <field type="password" variable="ONE_PASSWORD"> <description align="left" *************** *** 844,852 **** </panel> <panel order="4"> ! <field type="title" txt="LDAP (Advanced)" /> <field type="rule" variable="LDAP_HOST"> <description align="left" txt="Tolven needs to communicate with LDAP in order to create and login users." /> ! <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 812,821 ---- </panel> <panel order="4"> ! <createForPack name="advanced-LDAP"/> ! <field type="title" txt="Advanced LDAP" /> <field type="rule" variable="LDAP_HOST"> <description align="left" txt="Tolven needs to communicate with LDAP in order to create and login users." /> ! <spec txt="Hostname or IP:" set="0:$LDAP_HOST" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 854,858 **** </field> <field type="rule" variable="LDAP_PORT"> ! <spec txt="LDAP Port:" set="0:636" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 823,827 ---- </field> <field type="rule" variable="LDAP_PORT"> ! <spec txt="LDAP Port:" set="0:$LDAP_PORT" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 860,864 **** </field> <field type="check" variable="LDAP_HOST_BROWSABLE"> ! <spec txt="Can Browse to LDAP Home Directory" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" --- 829,833 ---- </field> <field type="check" variable="LDAP_HOST_BROWSABLE"> ! <spec txt="Can Browse to LDAP Home Directory" true="true" false="false" set="$LDAP_HOST_BROWSABLE" /> </field> <field type="staticText" align="left" *************** *** 881,896 **** <field type="text" variable="LDAP_BASEDN"> <spec txt="Base DN:" size="30" ! set="ou=people,dc=tolven,dc=com" /> </field> <field type="text" variable="LDAP_GENGROUPDN"> <spec txt="General Group DN:" size="30" ! set="cn=gen,ou=groups,dc=tolven,dc=com" /> </field> <field type="text" variable="LDAP_ROOTDN"> <spec txt="Root DN:" size="30" ! set="cn=Manager,dc=tolven,dc=com" /> </field> <field type="rule" variable="LDAP_SALT"> ! <spec txt="LDAP Password Hash Salt:" set="0:hgfedcba" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 850,865 ---- <field type="text" variable="LDAP_BASEDN"> <spec txt="Base DN:" size="30" ! set="$LDAP_BASEDN" /> </field> <field type="text" variable="LDAP_GENGROUPDN"> <spec txt="General Group DN:" size="30" ! set="$LDAP_GENGROUPDN" /> </field> <field type="text" variable="LDAP_ROOTDN"> <spec txt="Root DN:" size="30" ! set="$LDAP_ROOTDN" /> </field> <field type="rule" variable="LDAP_SALT"> ! <spec txt="LDAP Password Hash Salt:" set="0:$LDAP_SALT" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 898,902 **** </field> <field type="rule" variable="LDAP_ITERATIONS"> ! <spec txt="LDAP Password Hash Iterations:" set="0:13" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 867,871 ---- </field> <field type="rule" variable="LDAP_ITERATIONS"> ! <spec txt="LDAP Password Hash Iterations:" set="0:$LDAP_ITERATIONS" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 905,911 **** </panel> <panel order="5"> ! <field type="title" txt="PostgreSQL (Advanced)" /> <field type="rule" variable="DB_HOST"> ! <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 874,881 ---- </panel> <panel order="5"> ! <createForPack name="advanced-postgreSQL"/> ! <field type="title" txt="Advanced PostgreSQL Settings" /> <field type="rule" variable="DB_HOST"> ! <spec txt="Hostname or IP:" set="0:$DB_HOST" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 913,917 **** </field> <field type="rule" variable="DB_PORT"> ! <spec txt="Port:" set="0:5432" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 883,887 ---- </field> <field type="rule" variable="DB_PORT"> ! <spec txt="Port:" set="0:$DB_PORT" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 919,923 **** </field> <field type="check" variable="DB_HOST_BROWSABLE"> ! <spec txt="Can Browse to PostgreSQL Home Directory" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" --- 889,893 ---- </field> <field type="check" variable="DB_HOST_BROWSABLE"> ! <spec txt="Can Browse to PostgreSQL Home Directory" true="true" false="false" set="$DB_HOST_BROWSABLE" /> </field> <field type="staticText" align="left" *************** *** 942,946 **** </field> <field type="rule" variable="DB_NAME"> ! <spec txt="Database Name:" set="0:postgres" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 912,916 ---- </field> <field type="rule" variable="DB_NAME"> ! <spec txt="Database Name:" set="0:$DB_NAME" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 948,952 **** </field> <field type="rule" variable="DB_SALT"> ! <spec txt="Password Hash Salt:" set="0:abcdefgh" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 918,922 ---- </field> <field type="rule" variable="DB_SALT"> ! <spec txt="Password Hash Salt:" set="0:$DB_SALT" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 954,958 **** </field> <field type="rule" variable="DB_ITERATIONS"> ! <spec txt="Password Hash Iterations:" set="0:13" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 924,928 ---- </field> <field type="rule" variable="DB_ITERATIONS"> ! <spec txt="Password Hash Iterations:" set="0:$DB_ITERATIONS" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 967,983 **** the client directory, replacing any that already exists." /> <field type="check" variable="USE_PG_CLIENT_CERT"> ! <spec txt="Use existing client credentials, if found" true="true" false="false" set="false" /> </field> </panel> <panel order="6"> ! <field type="title" txt="JBoss-Tomcat Web Server (Advanced)" /> ! <field type="rule" variable="JBOSS_HOST"> ! <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="WebServer Hostname or IP cannot be blank." /> ! </field> <field type="rule" variable="WEBSERVER_HTTP_PORT"> ! <spec txt="WebServer HTTP Port:" set="0:8080" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 937,954 ---- the client directory, replacing any that already exists." /> <field type="check" variable="USE_PG_CLIENT_CERT"> ! <spec txt="Use existing client credentials, if found" true="true" false="false" set="$USE_PG_CLIENT_CERT" /> ! </field> ! <field type="text" variable="REPOSITORY_OID"> ! <description align="left" ! txt="This value must be set to a globally unique value for live operation. ! The default is adequate for testing." /> ! <spec txt="Repository OID:" size="40" set="1.2" /> </field> </panel> <panel order="6"> ! <createForPack name="advanced-web"/> ! <field type="title" txt="Advanced Web Server settings" /> <field type="rule" variable="WEBSERVER_HTTP_PORT"> ! <spec txt="WebServer HTTP Port:" set="0:$WEBSERVER_HTTP_PORT" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 985,989 **** </field> <field type="rule" variable="WEBSERVER_HTTPS_PORT"> ! <spec txt="WebServer HTTPS Port:" set="0:8443" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 956,960 ---- </field> <field type="rule" variable="WEBSERVER_HTTPS_PORT"> ! <spec txt="WebServer HTTPS Port:" set="0:$WEBSERVER_HTTPS_PORT" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 991,995 **** </field> <field type="rule" variable="WEBSERVER_HTTP_REDIRECTPORT"> ! <spec txt="WebServer Redirect Port:" set="0:8443" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 962,966 ---- </field> <field type="rule" variable="WEBSERVER_HTTP_REDIRECTPORT"> ! <spec txt="WebServer Redirect Port:" set="0:$WEBSERVER_HTTP_REDIRECTPORT" layout="N:5:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 998,1012 **** </panel> <panel order="7"> ! <field type="title" txt="Server Credentials (Advanced)" /> <field type="staticText" align="left" txt="Common Name (CN) and Email addresses for certificates." /> <field type="text" variable="CERT_JBOSS_COMMON_NAME"> <spec txt="JBoss CN:" size="40" ! set="tolven-demo-jboss-host" /> </field> ! <field type="rule" variable="CERT_JBOSS_EMAIL"> ! <spec txt="JBoss Email:" layout="O:15:U @ O:15:40 . A:3:3" ! set="0:tolven-demo-jboss-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 969,1018 ---- </panel> <panel order="7"> ! <createForPack name="advanced-security"/> ! <field type="title" txt="CA Credentials" /> ! <field type="text" variable="CERT_COUNTRY_NAME"> ! <spec txt="Country Name:" size="35" set="$CERT_COUNTRY_NAME" /> ! </field> ! <field type="text" variable="CERT_STATE_OR_PROVINCE"> ! <spec txt="State or Province:" size="3" set="$CERT_STATE_OR_PROVINCE" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_NAME"> ! <spec txt="Organization Name:" size="35" ! set="$CERT_ORGANIZATION_NAME" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_UNIT_NAME"> ! <spec txt="Organization Unit Name:" size="35" ! set="$CERT_ORGANIZATION_UNIT_NAME" /> ! </field> ! ! <field type="text" variable="CERT_CA_COMMON_NAME"> ! <spec txt="CA Common Name:" size="35" ! set="$CERT_CA_COMMON_NAME" /> ! </field> ! <field type="text" variable="CERT_CA_EMAIL"> ! <spec txt="CA Email:" size="150" ! set="$CERT_CA_EMAIL" ! resultFormat="displayFormat" /> ! <validator ! class="com.izforge.izpack.util.RegularExpressionValidator" ! txt="Invalid email address!"> ! <param name="pattern" ! value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> ! </validator> ! </field> ! </panel> ! ! <panel order="8"> ! <createForPack name="advanced-security"/> ! <field type="title" txt="Server credentials for mutual authentication" /> <field type="staticText" align="left" txt="Common Name (CN) and Email addresses for certificates." /> <field type="text" variable="CERT_JBOSS_COMMON_NAME"> <spec txt="JBoss CN:" size="40" ! set="$CERT_JBOSS_COMMON_NAME" /> </field> ! <field type="text" variable="CERT_JBOSS_EMAIL"> ! <spec txt="JBoss Email:" size="60" ! set="$CERT_JBOSS_EMAIL" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1017,1026 **** </field> <field type="text" variable="CERT_LDAP_COMMON_NAME"> ! <spec txt="LDAP CN:" size="40" set="tolven-demo-ldap-host" /> </field> ! <field type="rule" variable="CERT_LDAP_EMAIL"> ! <spec txt="LDAP Email:" layout="O:15:U @ O:15:40 . A:3:3" ! set="0:tolven-demo-ldap-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1023,1031 ---- </field> <field type="text" variable="CERT_LDAP_COMMON_NAME"> ! <spec txt="LDAP CN:" size="40" set="$CERT_LDAP_COMMON_NAME" /> </field> ! <field type="text" variable="CERT_LDAP_EMAIL"> ! <spec txt="LDAP Email:" size="60" ! set="$CERT_LDAP_EMAIL" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1031,1040 **** </field> <field type="text" variable="CERT_DB_COMMON_NAME"> ! <spec txt="DB CN:" size="40" set="tolven-demo-db-host" /> </field> ! <field type="rule" variable="CERT_DB_EMAIL"> ! <spec txt="DB Email:" layout="O:15:U @ O:15:40 . A:3:3" ! set="0:tolven-demo-db-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1036,1044 ---- </field> <field type="text" variable="CERT_DB_COMMON_NAME"> ! <spec txt="DB CN:" size="40" set="$CERT_DB_COMMON_NAME" /> </field> ! <field type="text" variable="CERT_DB_EMAIL"> ! <spec txt="DB Email:" size="60" ! set="$CERT_DB_EMAIL" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1046,1056 **** <field type="text" variable="CERT_WEBSERVER_COMMON_NAME"> <spec txt="WebServer CN:" size="40" ! set="tolven-demo-webserver-host" /> </field> ! <field type="rule" variable="CERT_WEBSERVER_EMAIL"> ! <spec txt="WebServer Email:" ! layout="O:15:U @ O:15:40 . A:3:3" ! set="0:tolven-demo-webserver-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1050,1058 ---- <field type="text" variable="CERT_WEBSERVER_COMMON_NAME"> <spec txt="WebServer CN:" size="40" ! set="$CERT_WEBSERVER_COMMON_NAME" /> </field> ! <field type="text" variable="CERT_WEBSERVER_EMAIL"> ! <spec txt="WebServer Email:" size="60" ! set="$CERT_WEBSERVER_EMAIL" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1062,1072 **** <field type="text" variable="CERT_PG_CLIENT_COMMON_NAME"> <spec txt="PG_Client CN:" size="40" ! set="tolven-demo-pg-client-host" /> </field> ! <field type="rule" variable="CERT_PG_CLIENT_EMAIL"> <spec txt="PG_Client Email:" ! layout="O:15:U @ O:15:40 . A:3:3" ! set="0:tolven-demo-pg-client-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1064,1072 ---- <field type="text" variable="CERT_PG_CLIENT_COMMON_NAME"> <spec txt="PG_Client CN:" size="40" ! set="$CERT_PG_CLIENT_COMMON_NAME" /> </field> ! <field type="text" variable="CERT_PG_CLIENT_EMAIL"> <spec txt="PG_Client Email:" ! set="$CERT_PG_CLIENT_EMAIL" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1077,1103 **** </field> </panel> ! <panel order="8"> ! <field type="title" txt="Mail (Advanced)" /> <field type="text" variable="MAIL_SMTP_HOST"> <description align="left" txt="The address of your SMTP server." /> <spec txt="Mail SMTP Host:" size="40" ! set="smtp.mydomain.com" /> </field> <field type="staticText" align="left" txt="If the server requires authentication or not. Many public servers now require authentication." /> <field type="check" variable="MAIL_SMTP_AUTH"> ! <spec txt="Mail SMTP Auth" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> <field type="check" variable="MAIL_DEBUG"> ! <spec txt="Mail Debug" true="true" false="false" set="true" /> </field> ! <field type="rule" variable="MAIL_FROM"> <description align="left" txt="The from address of the email." /> ! <spec txt="From Email:" layout="O:15:U @ O:15:40 . A:3:3" ! set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1077,1126 ---- </field> </panel> ! <panel order="9"> ! <createForPack name="advanced-registration"/> ! <field type="title" txt="Registration Options" /> ! <field type="staticText" align="left" ! txt="The login page has two different registration links, one for a normally activated ! login and the other creates a demo user without needing email activation. ! Turning both off means users can only login to pre-existing accounts." /> ! <field type="check" variable="CREATE_DEMO_USER"> ! <spec txt="Create Demo User" true="true" false="false" set="true" /> ! </field> ! <field type="check" variable="ACTIVATE_USER"> ! <spec txt="Activate User" true="true" false="false" set="false" /> ! </field> ! <field type="staticText" align="left" ! txt="The two kinds of user registration pages are separate pages. ! The fields in each are customized to the type of registration. For example, ! creating a demo user account has a separate username (which is NOT an email address) ! and an email mail address field which is not verified. The full email-activation page, ! on the other hand, requires an email address as user id and it verifies the address via email." /> ! <field type="staticText" align="left" ! txt="If you enable email activation, the following two ." /> ! </panel> ! <panel order="10"> ! <createForPack name="advanced-registration"/> ! <field type="title" txt="Mail" /> <field type="text" variable="MAIL_SMTP_HOST"> <description align="left" txt="The address of your SMTP server." /> <spec txt="Mail SMTP Host:" size="40" ! set="$MAIL_SMTP_HOST" /> </field> <field type="staticText" align="left" txt="If the server requires authentication or not. Many public servers now require authentication." /> <field type="check" variable="MAIL_SMTP_AUTH"> ! <spec txt="Mail SMTP Auth" true="true" false="false" set="$MAIL_SMTP_AUTH" /> </field> <field type="staticText" align="left" txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> <field type="check" variable="MAIL_DEBUG"> ! <spec txt="Mail Debug" true="true" false="false" set="$MAIL_DEBUG" /> </field> ! <field type="text" variable="MAIL_FROM"> <description align="left" txt="The from address of the email." /> ! <spec txt="From Email:" size="60" ! set="$MAIL_FROM" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1110,1120 **** <description align="left" txt="The name of your business or agency." /> ! <spec txt="Business Name:" size="40" set="My Organization" /> </field> ! <field type="rule" variable="MAIL_USER"> <description align="left" txt="The username under which the mail will be sent." /> ! <spec txt="User Name:" layout="O:15:U @ O:15:40 . A:3:3" ! set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> <validator class="com.izforge.izpack.util.RegularExpressionValidator" --- 1133,1143 ---- <description align="left" txt="The name of your business or agency." /> ! <spec txt="Business Name:" size="40" set="$MAIL_FROM_NAME" /> </field> ! <field type="text" variable="MAIL_USER"> <description align="left" txt="The username under which the mail will be sent." /> ! <spec txt="User Name:" size="60" ! set="$MAIL_USER"/> <validator class="com.izforge.izpack.util.RegularExpressionValidator" *************** *** 1124,1170 **** </validator> </field> ! <field type="password" variable="MAIL_PASSWORD"> ! <description align="left" ! txt="If mail.smtp.auth=true, the password of the account sending the mail." /> ! <spec> ! <pwd txt="Mail Password:" size="20" set="" /> ! <pwd txt="Retype Password:" size="20" set="" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! </panel> ! <panel order="9"> ! <field type="title" txt="Repository OID (Advanced)" /> ! <field type="text" variable="REPOSITORY_OID"> <description align="left" ! txt="This value must be set to a globally unique value for live operation. ! The default is adequate for testing." /> ! <spec txt="Repository OID:" size="40" set="1.2" /> ! </field> ! </panel> ! <panel order="10"> ! <field type="title" txt="Registration Options (Advanced)" /> ! <field type="staticText" align="left" ! txt="The login page has two different registration links, one for a normally activated ! login and the other creates a demo user without needing email activation. ! Turning both off means users can only login to pre-existing accounts." /> ! <field type="check" variable="CREATE_DEMO_USER"> ! <spec txt="Create Demo User" true="true" false="false" set="true" /> ! </field> ! <field type="check" variable="ACTIVATE_USER"> ! <spec txt="Activate User" true="true" false="false" set="false" /> </field> - <field type="staticText" align="left" - txt="The two kinds of user registration pages are separate pages. - The fields in each are customized to the type of registration. For example, - creating a demo user account has a separate username (which is NOT an email address) - and an email mail address field which is not verified. The full email-activation page, - on the other hand, requires an email address as user id and it verifies the address via email." /> - <field type="staticText" align="left" - txt="If you would rather not use email activation, uncheck Activate User." /> </panel> <panel order="11"> ! <field type="title" txt="Invitation (Advanced)" /> <field type="text" variable="INVITATION_HOST"> <spec txt="Invitation Host:" size="20" set="mydomain.com" /> --- 1147,1159 ---- </validator> </field> ! <field type="text" variable="MAIL_PASSWORD"> <description align="left" ! txt="If mail.smtp.auth=true, the password of the account sending the mail, stored as plain text." /> ! <spec txt="Mail Password:" size="30" set="$MAIL_USER"/> </field> </panel> <panel order="11"> ! <createForPack name="advanced-registration"/> ! <field type="title" txt="Invitations" /> <field type="text" variable="INVITATION_HOST"> <spec txt="Invitation Host:" size="20" set="mydomain.com" /> Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** tolven-install.xml 9 Oct 2006 16:11:47 -0000 1.10 --- tolven-install.xml 12 Oct 2006 23:52:36 -0000 1.11 *************** *** 71,78 **** <jar src="../apache-ant-1.6.5/lib/ant-jsch.jar" /> <jar src="../apache-ant-1.6.5/lib/jsch-0.1.28.jar" /> ! <packs> <pack name="base" required="yes"> ! <description>The base files</description> <file src="tolven-install-build.xml" targetdir="$INSTALL_PATH" /> --- 71,124 ---- <jar src="../apache-ant-1.6.5/lib/ant-jsch.jar" /> <jar src="../apache-ant-1.6.5/lib/jsch-0.1.28.jar" /> ! <variables> ! <variable name="LDAP_HOST" value="localhost"/> ! <variable name="LDAP_PORT" value="636"/> ! <variable name="LDAP_HOST_BROWSABLE" value="true"/> ! <variable name="LDAP_BASEDN" value="ou=people,dc=tolven,dc=com"/> ! <variable name="LDAP_GENGROUPDN" value="cn=gen,ou=groups,dc=tolven,dc=com"/> ! <variable name="LDAP_ROOTDN" value="cn=Manager,dc=tolven,dc=com"/> ! <variable name="LDAP_SALT" value="hgfedcba"/> ! <variable name="LDAP_ITERATIONS" value="13"/> ! <variable name="DB_HOST" value="localhost"/> ! <variable name="DB_PORT" value="5432"/> ! <variable name="DB_HOST_BROWSABLE" value="true"/> ! <variable name="DB_NAME" value="postgres"/> ! <variable name="DB_SALT" value="abcdefgh"/> ! <variable name="DB_ITERATIONS" value="13"/> ! <variable name="USE_PG_CLIENT_CERT" value="false"/> ! <variable name="WEBSERVER_HTTP_PORT" value="8080"/> ! <variable name="WEBSERVER_HTTPS_PORT" value="8443"/> ! <variable name="WEBSERVER_HTTP_REDIRECTPORT" value="8443"/> ! <variable name="CREATE_DEMO_USER" value="true"/> ! <variable name="ACTIVATE_USER" value="false"/> ! <variable name="MAIL_SMTP_HOST" value="smtp.mydomain.com"/> ! <variable name="MAIL_SMTP_AUTH" value="true"/> ! <variable name="MAIL_DEBUG" value="true"/> ! <variable name="MAIL_FROM" value="no...@my..."/> ! <variable name="MAIL_FROM_NAME" value="My Organization"/> ! <variable name="MAIL_USER" value="no...@my..."/> ! <variable name="MAIL_PASSWORD" value=""/> ! <variable name="INVITATION_HOST" value="mydomain.com"/> ! <variable name="INVITATION_PORT" value="8080"/> ! <variable name="CERT_COUNTRY_NAME" value="US"/> ! <variable name="CERT_STATE_OR_PROVINCE" value="CA"/> ! <variable name="CERT_ORGANIZATION_NAME" value="Tolven Healthcare"/> ! <variable name="CERT_ORGANIZATION_UNIT_NAME" value="Tolven Demo"/> ! <variable name="CERT_CA_COMMON_NAME" value="tolven-demo-ca-host"/> ! <variable name="CERT_CA_EMAIL" value="tol...@to..."/> ! <variable name="CERT_JBOSS_COMMON_NAME" value="tolven-demo-jboss-host"/> ! <variable name="CERT_JBOSS_EMAIL" value="tol...@to..."/> ! <variable name="CERT_LDAP_COMMON_NAME" value="tolven-demo-ldap-host"/> ! <variable name="CERT_LDAP_EMAIL" value="tol...@to..."/> ! <variable name="CERT_DB_COMMON_NAME" value="tolven-demo-db-host"/> ! <variable name="CERT_WEBSERVER_COMMON_NAME" value="tolven-demo-webserver-host"/> ! <variable name="CERT_WEBSERVER_EMAIL" value="tol...@to..."/> ! <variable name="CERT_PG_CLIENT_COMMON_NAME" value="tolven-demo-pg-client-host"/> ! <variable name="CERT_DB_EMAIL" value="tol...@to..."/> ! <variable name="CERT_PG_CLIENT_EMAIL" value="tol...@to..."/> ! </variables> <packs> <pack name="base" required="yes"> ! <description>The base files needed to start and stop the Tolven servers.</description> <file src="tolven-install-build.xml" targetdir="$INSTALL_PATH" /> *************** *** 129,132 **** --- 175,198 ---- targetfile="$INSTALL_PATH/bin/startAntelope.bat" keep="true" os="windows" /> </pack> + <pack name="advanced-LDAP" required="no" preselected="no"> + <description>Advanced LDAP settings allow you to specify an LDAP server on a remote system, details of the LDAP schema, and additional security settings.</description> + <depends packname="base" /> + </pack> + <pack name="advanced-postgreSQL" required="no" preselected="no"> + <description>Allows you to specify a database server on a remote system and additional security settings.</description> + <depends packname="base" /> + </pack> + <pack name="advanced-web" required="no" preselected="no"> + <description>Allows you to change the ports that the web server will listen on.</description> + <depends packname="base" /> + </pack> + <pack name="advanced-security" required="no" preselected="no"> + <description>Allows you to override default mutual authentication settings for certificate authority and server credentials.</description> + <depends packname="base" /> + </pack> + <pack name="advanced-registration" required="no" preselected="no"> + <description>By default, Tolven provides a simple registration process for new users. Advanced registration uses an email activation process.</description> + <depends packname="base" /> + </pack> <pack name="install-tolven" required="yes"> <description>Install Tolven</description> *************** *** 160,212 **** <depends packname="base" /> </pack> ! <pack name="install-apache-ant-1.6.5" required="yes"> ! <description> ! Unzip Apache Ant ! </description> ! <depends packname="create-ant-properties" /> ! <depends packname="create-tolven-properties" /> ! </pack> ! <pack name="install-tolven-jboss.4.0.4.GA" required="yes"> <description> ! Unzip Tolven JBoss and Create Properties </description> <depends packname="create-ant-properties" /> <depends packname="create-tolven-properties" /> </pack> ! <pack name="create-tolven-stage" required="yes"> ! <description>Create Tolven Stage</description> ! <depends packname="create-ant-properties" /> ! <depends packname="create-tolven-properties" /> ! <depends packname="install-tolven" /> ! </pack> ! <pack name="deploy-ldap-from-stage" required="yes"> ! <description>Deploy To LDAP From Tolven Stage</description> ! <depends packname="install-tolven-jboss.4.0.4.GA" /> ! <depends packname="create-tolven-stage" /> ! </pack> ! <pack name="deploy-db-from-stage" required="yes"> ! <description> ! Deploy To PostgreSQL From Tolven Stage ! </description> ! <depends packname="install-tolven-jboss.4.0.4.GA" /> ! <depends packname="create-tolven-stage" /> ! </pack> ! <pack name="deploy-jboss-from-stage" required="yes"> ! <description>Deploy To JBoss From Tolven Stage</description> ! <depends packname="install-tolven-jboss.4.0.4.GA" /> ! <depends packname="create-tolven-stage" /> ! </pack> ! <pack name="deploy-pg-client-credentials-from-stage" ! required="yes"> ! <description> ! Deploy To PostgreSQL Client From Tolven Stage ! </description> ! <depends packname="install-tolven-jboss.4.0.4.GA" /> ! <depends packname="create-tolven-stage" /> ! </pack> ! <pack name="initialize-ldap" required="yes"> ! <description>Initialize LDAP</description> ! <depends packname="create-tolven-stage" /> ! </pack> <pack name="short-cuts" required="yes"> <description>Create Shortcuts</description> --- 226,237 ---- <depends packname="base" /> </pack> ! <pack name="build-and-deploy" required="yes"> <description> ! Build and deploy tolven </description> <depends packname="create-ant-properties" /> <depends packname="create-tolven-properties" /> </pack> ! <pack name="short-cuts" required="yes"> <description>Create Shortcuts</description> Index: antActionsSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/antActionsSpec.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** antActionsSpec.xml 2 Oct 2006 06:49:03 -0000 1.4 --- antActionsSpec.xml 12 Oct 2006 23:52:36 -0000 1.5 *************** *** 15,19 **** </antcall> </pack> ! <pack name="install-apache-ant-1.6.5"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="unzip-apache-ant" /> --- 15,19 ---- </antcall> </pack> ! <pack name="build-and-deploy"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="unzip-apache-ant" /> *************** *** 23,28 **** <property name="install.path" value="$INSTALL_PATH" /> </antcall> - </pack> - <pack name="install-tolven-jboss.4.0.4.GA"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="unzip-tolven-jboss" /> --- 23,26 ---- *************** *** 32,37 **** <property name="install.path" value="$INSTALL_PATH" /> </antcall> - </pack> - <pack name="create-tolven-stage"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="stage-init-all" /> --- 30,33 ---- *************** *** 42,47 **** <property name="tolven.database.keystore.password" value="$DB_KEYSTORE_PASSWORD" /> </antcall> - </pack> - <pack name="deploy-ldap-from-stage"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="deploy-ldap-from-stage" /> --- 38,41 ---- *************** *** 52,57 **** <property name="tolven.ldap.host.password" value="$LDAP_HOST_PASSWORD" /> </antcall> - </pack> - <pack name="deploy-db-from-stage"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="deploy-db-from-stage" /> --- 46,49 ---- *************** *** 60,75 **** <property name="tolven.pg.host.password" value="$DB_HOST_PASSWORD" /> </antcall> - </pack> - <pack name="deploy-jboss-from-stage"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="deploy-jboss-from-stage" /> </antcall> - </pack> - <pack name="deploy-pg-client-credentials-from-stage"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="deploy-pg-client-credentials-from-stage" /> </antcall> - </pack> - <pack name="initialize-ldap"> <antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml"> <target name="ldapInit" /> --- 52,61 ---- |
|
From: John C. <jc...@us...> - 2006-10-09 20:31:05
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1135/installer/izpack-8.1 Modified Files: shortcutSpec.xml Log Message: Try to change display order Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/shortcutSpec.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shortcutSpec.xml 9 Oct 2006 16:11:47 -0000 1.5 --- shortcutSpec.xml 9 Oct 2006 20:31:02 -0000 1.6 *************** *** 4,19 **** <programGroup defaultName="Tolven" location="applications" /> ! <shortcut name="Start Antelope" ! target="$INSTALL_PATH\bin\startAntelope.bat" ! workingDirectory="$INSTALL_PATH\tolven\lib\antelope\AntelopeApp_3.2.18" ! description="Start Antelope" ! programGroup="yes" desktop="no" applications="no" ! startMenu="yes" startup="no"> ! <createForPack name="short-cuts" /> ! </shortcut> ! <shortcut name="Start Tolven LDAP" target="$INSTALL_PATH\bin\startTolvenLDAP.bat" workingDirectory="$INSTALL_PATH" ! description="Start Tolven LDAP" programGroup="yes" desktop="yes" applications="no" startMenu="no" startup="no"> --- 4,11 ---- <programGroup defaultName="Tolven" location="applications" /> ! <shortcut name="Run Tolven LDAP" target="$INSTALL_PATH\bin\startTolvenLDAP.bat" workingDirectory="$INSTALL_PATH" ! description="Run Tolven LDAP" programGroup="yes" desktop="yes" applications="no" startMenu="no" startup="no"> *************** *** 28,39 **** <createForPack name="short-cuts" /> </shortcut> - <shortcut name="Stop Tolven PostgreSQL" - target="$INSTALL_PATH\bin\stopTolvenPG.bat" - workingDirectory="$INSTALL_PATH" - description="Stop Tolven PostgreSQL" - programGroup="yes" desktop="yes" applications="no" - startMenu="no" startup="no"> - <createForPack name="short-cuts" /> - </shortcut> <shortcut name="Start Tolven JBoss" target="$INSTALL_PATH\bin\startTolvenJBoss.bat" --- 20,23 ---- *************** *** 52,55 **** --- 36,55 ---- <createForPack name="short-cuts" /> </shortcut> + <shortcut name="Stop Tolven PostgreSQL" + target="$INSTALL_PATH\bin\stopTolvenPG.bat" + workingDirectory="$INSTALL_PATH" + description="Stop Tolven PostgreSQL" + programGroup="yes" desktop="yes" applications="no" + startMenu="no" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> + <shortcut name="Start Antelope" + target="$INSTALL_PATH\bin\startAntelope.bat" + workingDirectory="$INSTALL_PATH\tolven\lib\antelope\AntelopeApp_3.2.18" + description="Start Antelope" + programGroup="yes" desktop="no" applications="no" + startMenu="yes" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> <shortcut name="Uninstall Tolven" target="$INSTALL_PATH\Uninstaller\uninstaller.jar" |
|
From: John C. <jc...@us...> - 2006-10-09 16:11:57
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23768/installer/izpack-8.1 Modified Files: installUserInputSpec.xml tolven-install.xml shortcutSpec.xml Log Message: Installer fixes and changes to provide basic and advanced flow Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** installUserInputSpec.xml 7 Oct 2006 22:36:03 -0000 1.6 --- installUserInputSpec.xml 9 Oct 2006 16:11:47 -0000 1.7 *************** *** 1,118 **** <userInput> <panel order="0"> - <field type="title" txt="Mail" /> - <field type="text" variable="MAIL_SMTP_HOST"> - <description align="left" - txt="The address of your SMTP server." /> - <spec txt="Mail SMTP Host:" size="40" - set="smtp.mydomain.com" /> - </field> - <field type="staticText" align="left" - txt="If the server requires authentication or not. Many public servers now require authentication." /> - <field type="check" variable="MAIL_SMTP_AUTH"> - <spec txt="Mail SMTP Auth" true="true" false="false" set="true" /> - </field> - <field type="staticText" align="left" - txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> - <field type="check" variable="MAIL_DEBUG"> - <spec txt="Mail Debug" true="true" false="false" set="true" /> - </field> - <field type="rule" variable="MAIL_FROM"> - <description align="left" - txt="The from address of the email." /> - <spec txt="From Email:" layout="O:15:U @ O:15:40 . A:3:3" - set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> - <validator - class="com.izforge.izpack.util.RegularExpressionValidator" - txt="Invalid email address!"> - <param name="pattern" - value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> - </validator> - </field> - <field type="text" variable="MAIL_FROM_NAME"> - <description align="left" - txt="The name of your business or agency." /> - <spec txt="Business Name:" size="40" set="My Organization" /> - </field> - <field type="rule" variable="MAIL_USER"> - <description align="left" - txt="The username under which the mail will be sent." /> - <spec txt="User Name:" layout="O:15:U @ O:15:40 . A:3:3" - set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> - <validator - class="com.izforge.izpack.util.RegularExpressionValidator" - txt="Invalid email address!"> - <param name="pattern" - value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> - </validator> - </field> - <field type="password" variable="MAIL_PASSWORD"> - <description align="left" - txt="If mail.smtp.auth=true, the password of the account sending the mail." /> - <spec> - <pwd txt="Mail Password:" size="20" set="" /> - <pwd txt="Retype Password:" size="20" set="" /> - </spec> - <validator class="com.izforge.izpack.util.PWDValidator" - txt="Both versions of the password must match" /> - </field> - </panel> - <panel order="1"> - <field type="title" txt="Repository OID" /> - <field type="text" variable="REPOSITORY_OID"> - <description align="left" - txt="In operation, this must be an globally unique OID (or possibly a UUID) that will be - added to any identifier created by Tolven that will be sent to other - systems. Uniqueness cannot just be to Tolven, it must be to the - instance of the database (not appllication server). - For example, if you create two Tolven databases, they must each have a unique OID so - that identifiers shared between them, or with other systems, - are not confused. See http://www.hl7.org/oid/index.cfm. - For standalone testing and development, the default is adequate." /> - <spec txt="Repository OID:" size="40" set="1.2" /> - </field> - </panel> - <panel order="2"> - <field type="title" txt="Registration Options" /> - <field type="staticText" align="left" - txt="The login page has two different registration links, one for a normally activated - login and the other creates a demo user without needing email activation. - Turning both off means users can only login to pre-existing accounts." /> - <field type="check" variable="CREATE_DEMO_USER"> - <spec txt="Create Demo User" true="true" false="false" set="true" /> - </field> - <field type="check" variable="ACTIVATE_USER"> - <spec txt="Activate User" true="true" false="false" set="true" /> - </field> - <field type="staticText" align="left" - txt="The two kinds of user registration pages are separate pages. - The fields in each are customized to the type of registration. For example, - creating a demo user account has a separate username (which is NOT an email address) - and an email mail address field which is not verified. The full email-activation page, - on the other hand, requires an email address as user id and it verifies the address via email." /> - <field type="staticText" align="left" - txt="If you would rather not use email activation, uncheck Activate User." /> - </panel> - <panel order="3"> - <field type="title" txt="Invitation" /> - <field type="text" variable="INVITATION_HOST"> - <spec txt="Invitation Host:" size="20" set="mydomain.com" /> - </field> - <field type="text" variable="INVITATION_PORT"> - <spec txt="Invitation Port:" size="10" set="8080" /> - </field> - <field type="staticText" align="left" - txt="Tolven Context: /Tolven" /> - <field type="staticText" align="left" - txt="When an invitation is sent, this url will be included in the message to allow the receiver to get back into the Tolven application and take action on the message." /> - <field type="staticText" align="left" - txt="The host and port (if not 443) should point the user directly back to your running Tolven application. Use either a DNS name or numeric IP address. Localhost won't work unless you only send invitations to yourself (the sys admin)." /> - <field type="staticText" align="left" - txt="The invitation will be of the form:" /> - <field type="staticText" align="left" - txt="http://InvitationHost:InvitationPort/Tolven/private/dispatch.jsf" /> - </panel> - - <panel order="4"> <field type="title" txt="Timezone" /> <field type="staticText" align="left" --- 1,4 ---- *************** *** 839,844 **** </field> </panel> ! <panel order="5"> ! <field type="title" txt="LDAP Host" /> <field type="rule" variable="LDAP_HOST"> <description align="left" --- 725,848 ---- </field> </panel> ! <panel order="1"> ! <field type="title" txt="LDAP Basic" /> ! <field type="search" variable="LDAP_LOCATION"> ! <spec txt="LDAP Home Directory:" type="directory" result="file" checkfilename="slapd.conf"> ! <choice value="/etc/openldap" os="unix" /> ! <choice value="c:\OpenLDAP" os="windows" /> ! <choice value="d:\OpenLDAP" os="windows" /> ! <choice value="e:\OpenLDAP" os="windows" /> ! <choice value="f:\OpenLDAP" os="windows" /> ! <choice value="c:\Program Files\OpenLDAP" os="windows" /> ! </spec> ! </field> ! <field type="password" variable="LDAP_PASSWORD"> ! <description align="left" ! txt="Enter the LDAP password to be hashed (default is secret)" /> ! <spec> ! <pwd txt="LDAP Password:" size="20" set="secret" /> ! <pwd txt="Retype password" size="20" set="secret" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! <field type="password" variable="LDAP_KEYSTORE_PASSWORD"> ! <description align="left" ! txt="Enter a keystore password to protect the LDAP password (default is tolven)" /> ! <spec> ! <pwd txt="LDAP KeyStore Password:" size="20" ! set="tolven" /> ! <pwd txt="Retype password" size="20" set="tolven" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! </panel> ! <panel order="2"> ! <field type="title" txt="PostgreSQL Basic" /> ! <field type="search" variable="DB_LOCATION"> ! <spec txt="PostgreSQL Home Directory:" type="directory" ! result="file" checkfilename="data/postgresql.conf"> ! <choice value="/var/lib/pgsql" os="unix" /> ! <choice value="/usr/local/pgsql" os="unix" /> ! <choice value="c:\postgreSQL\8.1" os="windows" /> ! <choice value="d:\postgreSQL\8.1" os="windows" /> ! <choice value="e:\postgreSQL\8.1" os="windows" /> ! <choice value="f:\postgreSQL\8.1" os="windows" /> ! <choice value="C:\Program Files\PostgreSQL\8.1" os="windows" /> ! </spec> ! </field> ! <field type="rule" variable="DB_USER"> ! <spec txt="Database User:" set="0:postgres" layout="O:18:U" /> ! <validator ! class="com.izforge.izpack.util.NotEmptyValidator" ! txt="Database User cannot be blank." /> ! </field> ! <field type="password" variable="DB_PASSWORD"> ! <description align="left" ! txt="Please enter the database password to be hashed (default is postgres)" /> ! <spec> ! <pwd txt="Password:" size="20" set="postgres" /> ! <pwd txt="Retype Password:" size="20" set="postgres" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! <field type="password" variable="DB_KEYSTORE_PASSWORD"> ! <description align="left" ! txt="Please enter a keystore password to protect the postgres password (default is tolven)" /> ! <spec> ! <pwd txt="Keystore Password:" size="20" set="tolven" /> ! <pwd txt="Retype Password:" size="20" set="tolven" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! </panel> ! <panel order="3"> ! <field type="title" txt="CA Credentials" /> ! <field type="text" variable="CERT_COUNTRY_NAME"> ! <spec txt="Country Name:" size="35" set="US" /> ! </field> ! <field type="text" variable="CERT_STATE_OR_PROVINCE"> ! <spec txt="State or Province:" size="3" set="CA" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_NAME"> ! <spec txt="Organization Name:" size="35" ! set="Tolven Healthcare" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_UNIT_NAME"> ! <spec txt="Organization Unit Name:" size="35" ! set="Tolven Demo" /> ! </field> ! ! <field type="text" variable="CERT_CA_COMMON_NAME"> ! <spec txt="CA Common Name:" size="35" ! set="tolven-demo-ca-host" /> ! </field> ! <field type="rule" variable="CERT_CA_EMAIL"> ! <spec txt="CA Email:" layout="O:12:U @ O:8:40 . A:3:3" ! set="0:tolven-demo-ca-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> ! <validator ! class="com.izforge.izpack.util.RegularExpressionValidator" ! txt="Invalid email address!"> ! <param name="pattern" ! value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> ! </validator> ! </field> ! <field type="password" variable="ONE_PASSWORD"> ! <description align="left" ! txt="Please enter single password for all keys and stores (default is tolven)" /> ! <spec> ! <pwd txt="Single Password:" size="20" set="tolven" /> ! <pwd txt="Retype password" size="20" set="tolven" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! </panel> ! <panel order="4"> ! <field type="title" txt="LDAP (Advanced)" /> <field type="rule" variable="LDAP_HOST"> <description align="left" *************** *** 859,870 **** </field> <field type="staticText" align="left" - txt="If checked, then browse to the LDAP home directory." /> - <field type="search" variable="LDAP_LOCATION"> - <spec txt="LDAP Home Directory:" type="directory" result="file"> - <choice value="/etc/openldap" os="unix" /> - <choice value="c:\OpenLDAP" os="windows" /> - </spec> - </field> - <field type="staticText" align="left" txt="If 'Can Browse to LDAP Home Directory' is not checked, then the LDAP home directory on the target machine should be entered into the combo box manually." /> <field type="text" variable="LDAP_HOST_USER"> --- 863,866 ---- *************** *** 881,887 **** txt="Both versions of the password must match" /> </field> ! </panel> ! <panel order="6"> ! <field type="title" txt="LDAP Server" /> <field type="text" variable="LDAP_BASEDN"> <spec txt="Base DN:" size="30" --- 877,882 ---- txt="Both versions of the password must match" /> </field> ! <field type="staticText" align="left" ! txt="If checked, then browse to the LDAP home directory." /> <field type="text" variable="LDAP_BASEDN"> <spec txt="Base DN:" size="30" *************** *** 896,922 **** set="cn=Manager,dc=tolven,dc=com" /> </field> - <field type="password" variable="LDAP_PASSWORD"> - <description align="left" - txt="Please enter the LDAP password to be hashed" /> - <spec> - <pwd txt="LDAP Password:" size="20" set="secret" /> - <pwd txt="Retype password" size="20" set="secret" /> - </spec> - <validator class="com.izforge.izpack.util.PWDValidator" - txt="Both versions of the password must match" /> - </field> - <field type="password" variable="LDAP_KEYSTORE_PASSWORD"> - <description align="left" - txt="Please enter a keystore password to protect the LDAP password" /> - <spec> - <pwd txt="LDAP KeyStore Password:" size="20" - set="tolven" /> - <pwd txt="Retype password" size="20" set="tolven" /> - </spec> - <validator class="com.izforge.izpack.util.PWDValidator" - txt="Both versions of the password must match" /> - </field> <field type="rule" variable="LDAP_SALT"> ! <spec txt="LDAP Password Hash Salt::" set="0:hgfedcba" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" --- 891,896 ---- set="cn=Manager,dc=tolven,dc=com" /> </field> <field type="rule" variable="LDAP_SALT"> ! <spec txt="LDAP Password Hash Salt:" set="0:hgfedcba" layout="O:18:U" /> <validator class="com.izforge.izpack.util.NotEmptyValidator" *************** *** 930,935 **** </field> </panel> ! <panel order="7"> ! <field type="title" txt="Postgresql Host" /> <field type="rule" variable="DB_HOST"> <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> --- 904,909 ---- </field> </panel> ! <panel order="5"> ! <field type="title" txt="PostgreSQL (Advanced)" /> <field type="rule" variable="DB_HOST"> <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> *************** *** 952,962 **** txt="If not checked, then the PostgreSQL home directory on the target machine should be entered into the combo box manually." /> - <field type="search" variable="DB_LOCATION"> - <spec txt="PostgreSQL Home Directory:" type="directory" - result="file"> - <choice value="/var/lib/pgsql" os="unix" /> - <choice value="c:\postgreSQL\8.1" os="windows" /> - </spec> - </field> <field type="staticText" align="left" txt="The information below is only required if the 'Can Browse to Postgresql Home' checkbox is unchecked." /> --- 926,929 ---- *************** *** 974,980 **** txt="Both versions of the password must match" /> </field> - </panel> - <panel order="8"> - <field type="title" txt="Postgresql Server" /> <field type="rule" variable="DB_NAME"> <spec txt="Database Name:" set="0:postgres" layout="O:18:U" /> --- 941,944 ---- *************** *** 983,1012 **** txt="Hostname or IP cannot be blank." /> </field> - <field type="rule" variable="DB_USER"> - <spec txt="Database User:" set="0:postgres" layout="O:18:U" /> - <validator - class="com.izforge.izpack.util.NotEmptyValidator" - txt="Database User cannot be blank." /> - </field> - <field type="password" variable="DB_PASSWORD"> - <description align="left" - txt="Please enter the database password to be hashed" /> - <spec> - <pwd txt="Password:" size="20" set="postgres" /> - <pwd txt="Retype Password:" size="20" set="postgres" /> - </spec> - <validator class="com.izforge.izpack.util.PWDValidator" - txt="Both versions of the password must match" /> - </field> - <field type="password" variable="DB_KEYSTORE_PASSWORD"> - <description align="left" - txt="Please enter a keystore password to protect the postgres password" /> - <spec> - <pwd txt="Keystore Password:" size="20" set="tolven" /> - <pwd txt="Retype Password:" size="20" set="tolven" /> - </spec> - <validator class="com.izforge.izpack.util.PWDValidator" - txt="Both versions of the password must match" /> - </field> <field type="rule" variable="DB_SALT"> <spec txt="Password Hash Salt:" set="0:abcdefgh" layout="O:18:U" /> --- 947,950 ---- *************** *** 1032,1037 **** </field> </panel> ! <panel order="9"> ! <field type="title" txt="JBoss (Tomcat) Web Server" /> <field type="rule" variable="JBOSS_HOST"> <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> --- 970,975 ---- </field> </panel> ! <panel order="6"> ! <field type="title" txt="JBoss-Tomcat Web Server (Advanced)" /> <field type="rule" variable="JBOSS_HOST"> <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> *************** *** 1059,1107 **** </field> </panel> ! <panel order="10"> ! <field type="title" txt="CA Credentials" /> ! <field type="text" variable="CERT_COUNTRY_NAME"> ! <spec txt="Country Name:" size="35" set="US" /> ! </field> ! <field type="text" variable="CERT_STATE_OR_PROVINCE"> ! <spec txt="State or Province:" size="3" set="CA" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_NAME"> ! <spec txt="Organization Name:" size="35" ! set="Tolven Healthcare Innovations" /> ! </field> ! <field type="text" variable="CERT_ORGANIZATION_UNIT_NAME"> ! <spec txt="Organization Unit Name:" size="35" ! set="Tolven Demo" /> ! </field> ! ! <field type="text" variable="CERT_CA_COMMON_NAME"> ! <spec txt="CA Common Name:" size="35" ! set="tolven-demo-ca-host" /> ! </field> ! <field type="rule" variable="CERT_CA_EMAIL"> ! <spec txt="CA Email:" layout="O:12:U @ O:8:40 . A:3:3" ! set="0:tolven-demo-ca-host 1:tolvendev 2:com" ! resultFormat="displayFormat" /> ! <validator ! class="com.izforge.izpack.util.RegularExpressionValidator" ! txt="Invalid email address!"> ! <param name="pattern" ! value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> ! </validator> ! </field> ! <field type="password" variable="ONE_PASSWORD"> ! <description align="left" ! txt="Please enter single password for all keys and stores" /> ! <spec> ! <pwd txt="Single Password:" size="20" set="tolven" /> ! <pwd txt="Retype password" size="20" set="tolven" /> ! </spec> ! <validator class="com.izforge.izpack.util.PWDValidator" ! txt="Both versions of the password must match" /> ! </field> ! </panel> ! <panel order="11"> ! <field type="title" txt="Server Credentials" /> <field type="staticText" align="left" txt="Common Name (CN) and Email addresses for certificates." /> --- 997,1002 ---- </field> </panel> ! <panel order="7"> ! <field type="title" txt="Server Credentials (Advanced)" /> <field type="staticText" align="left" txt="Common Name (CN) and Email addresses for certificates." /> *************** *** 1182,1184 **** --- 1077,1188 ---- </field> </panel> + <panel order="8"> + <field type="title" txt="Mail (Advanced)" /> + <field type="text" variable="MAIL_SMTP_HOST"> + <description align="left" + txt="The address of your SMTP server." /> + <spec txt="Mail SMTP Host:" size="40" + set="smtp.mydomain.com" /> + </field> + <field type="staticText" align="left" + txt="If the server requires authentication or not. Many public servers now require authentication." /> + <field type="check" variable="MAIL_SMTP_AUTH"> + <spec txt="Mail SMTP Auth" true="true" false="false" set="true" /> + </field> + <field type="staticText" align="left" + txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> + <field type="check" variable="MAIL_DEBUG"> + <spec txt="Mail Debug" true="true" false="false" set="true" /> + </field> + <field type="rule" variable="MAIL_FROM"> + <description align="left" + txt="The from address of the email." /> + <spec txt="From Email:" layout="O:15:U @ O:15:40 . A:3:3" + set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> + <validator + class="com.izforge.izpack.util.RegularExpressionValidator" + txt="Invalid email address!"> + <param name="pattern" + value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> + </validator> + </field> + <field type="text" variable="MAIL_FROM_NAME"> + <description align="left" + txt="The name of your business or agency." /> + <spec txt="Business Name:" size="40" set="My Organization" /> + </field> + <field type="rule" variable="MAIL_USER"> + <description align="left" + txt="The username under which the mail will be sent." /> + <spec txt="User Name:" layout="O:15:U @ O:15:40 . A:3:3" + set="0:notify 1:mydomain 2:com" resultFormat="displayFormat" /> + <validator + class="com.izforge.izpack.util.RegularExpressionValidator" + txt="Invalid email address!"> + <param name="pattern" + value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" /> + </validator> + </field> + <field type="password" variable="MAIL_PASSWORD"> + <description align="left" + txt="If mail.smtp.auth=true, the password of the account sending the mail." /> + <spec> + <pwd txt="Mail Password:" size="20" set="" /> + <pwd txt="Retype Password:" size="20" set="" /> + </spec> + <validator class="com.izforge.izpack.util.PWDValidator" + txt="Both versions of the password must match" /> + </field> + </panel> + <panel order="9"> + <field type="title" txt="Repository OID (Advanced)" /> + <field type="text" variable="REPOSITORY_OID"> + <description align="left" + txt="This value must be set to a globally unique value for live operation. + The default is adequate for testing." /> + <spec txt="Repository OID:" size="40" set="1.2" /> + </field> + </panel> + <panel order="10"> + <field type="title" txt="Registration Options (Advanced)" /> + <field type="staticText" align="left" + txt="The login page has two different registration links, one for a normally activated + login and the other creates a demo user without needing email activation. + Turning both off means users can only login to pre-existing accounts." /> + <field type="check" variable="CREATE_DEMO_USER"> + <spec txt="Create Demo User" true="true" false="false" set="true" /> + </field> + <field type="check" variable="ACTIVATE_USER"> + <spec txt="Activate User" true="true" false="false" set="false" /> + </field> + <field type="staticText" align="left" + txt="The two kinds of user registration pages are separate pages. + The fields in each are customized to the type of registration. For example, + creating a demo user account has a separate username (which is NOT an email address) + and an email mail address field which is not verified. The full email-activation page, + on the other hand, requires an email address as user id and it verifies the address via email." /> + <field type="staticText" align="left" + txt="If you would rather not use email activation, uncheck Activate User." /> + </panel> + <panel order="11"> + <field type="title" txt="Invitation (Advanced)" /> + <field type="text" variable="INVITATION_HOST"> + <spec txt="Invitation Host:" size="20" set="mydomain.com" /> + </field> + <field type="text" variable="INVITATION_PORT"> + <spec txt="Invitation Port:" size="10" set="8080" /> + </field> + <field type="staticText" align="left" + txt="Tolven Context: /Tolven" /> + <field type="staticText" align="left" + txt="When an invitation is sent, this url will be included in the message to allow the receiver to get back into the Tolven application and take action on the message." /> + <field type="staticText" align="left" + txt="The host and port (if not 443) should point the user directly back to your running Tolven application. Use either a DNS name or numeric IP address. Localhost won't work unless you only send invitations to yourself (the sys admin)." /> + <field type="staticText" align="left" + txt="The invitation will be of the form:" /> + <field type="staticText" align="left" + txt="http://InvitationHost:InvitationPort/Tolven/private/dispatch.jsf" /> + </panel> + + </userInput> \ No newline at end of file Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tolven-install.xml 7 Oct 2006 22:36:03 -0000 1.9 --- tolven-install.xml 9 Oct 2006 16:11:47 -0000 1.10 *************** *** 79,98 **** <parsable targetfile="$INSTALL_PATH/tolven-install-build.xml" /> ! <file src="bin/startAntelope.sh" ! targetdir="$INSTALL_PATH/bin" os="unix" /> ! <parsable targetfile="$INSTALL_PATH/bin/startAntelope.sh" ! os="unix" /> <executable ! targetfile="$INSTALL_PATH/bin/startAntelope.sh" keep="true" os="unix" /> ! <file src="bin/startAntelope.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> ! <parsable targetfile="$INSTALL_PATH/bin/startAntelope.bat" os="windows" /> <executable ! targetfile="$INSTALL_PATH/bin/startAntelope.bat" keep="true" os="windows" /> <file src="bin/startTolvenJBoss.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> <parsable targetfile="$INSTALL_PATH/bin/startTolvenJBoss.bat" os="windows" /> <file src="bin/stopTolvenJBoss.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> --- 79,104 ---- <parsable targetfile="$INSTALL_PATH/tolven-install-build.xml" /> ! ! <file src="bin/startTolvenLDAP.bat" ! targetdir="$INSTALL_PATH/bin" os="windows" /> ! <parsable targetfile="$INSTALL_PATH/bin/startTolvenLDAP.bat" ! os="windows" /> <executable ! targetfile="$INSTALL_PATH/bin/startTolvenLDAP.bat" keep="true" os="windows" /> ! ! <file src="bin/startTolvenPG.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> ! <parsable targetfile="$INSTALL_PATH/bin/startTolvenPG.bat" os="windows" /> <executable ! targetfile="$INSTALL_PATH/bin/startTolvenPG.bat" keep="true" os="windows" /> ! <file src="bin/startTolvenJBoss.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> <parsable targetfile="$INSTALL_PATH/bin/startTolvenJBoss.bat" os="windows" /> + <executable + targetfile="$INSTALL_PATH/bin/bin/startTolvenJBoss.bat" keep="true" os="windows" /> + <file src="bin/stopTolvenJBoss.bat" targetdir="$INSTALL_PATH/bin" os="windows" /> *************** *** 100,103 **** --- 106,130 ---- os="windows" /> <executable + targetfile="$INSTALL_PATH/bin/bin/stopTolvenJBoss.bat" keep="true" os="windows" /> + + <file src="bin/stopTolvenPG.bat" + targetdir="$INSTALL_PATH/bin" os="windows" /> + <parsable targetfile="$INSTALL_PATH/bin/stopTolvenPG.bat" + os="windows" /> + <executable + targetfile="$INSTALL_PATH/bin/stopTolvenPG.bat" keep="true" os="windows" /> + + <file src="bin/startAntelope.sh" + targetdir="$INSTALL_PATH/bin" os="unix" /> + <parsable targetfile="$INSTALL_PATH/bin/startAntelope.sh" + os="unix" /> + <executable + targetfile="$INSTALL_PATH/bin/startAntelope.sh" keep="true" os="unix" /> + + <file src="bin/startAntelope.bat" + targetdir="$INSTALL_PATH/bin" os="windows" /> + <parsable targetfile="$INSTALL_PATH/bin/startAntelope.bat" + os="windows" /> + <executable targetfile="$INSTALL_PATH/bin/startAntelope.bat" keep="true" os="windows" /> </pack> Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/shortcutSpec.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** shortcutSpec.xml 7 Oct 2006 22:24:53 -0000 1.4 --- shortcutSpec.xml 9 Oct 2006 16:11:47 -0000 1.5 *************** *** 12,15 **** --- 12,39 ---- <createForPack name="short-cuts" /> </shortcut> + <shortcut name="Start Tolven LDAP" + target="$INSTALL_PATH\bin\startTolvenLDAP.bat" + workingDirectory="$INSTALL_PATH" + description="Start Tolven LDAP" + programGroup="yes" desktop="yes" applications="no" + startMenu="no" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> + <shortcut name="Start Tolven PostgreSQL" + target="$INSTALL_PATH\bin\startTolvenPG.bat" + workingDirectory="$INSTALL_PATH" + description="Start Tolven PostgreSQL" + programGroup="yes" desktop="yes" applications="no" + startMenu="no" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> + <shortcut name="Stop Tolven PostgreSQL" + target="$INSTALL_PATH\bin\stopTolvenPG.bat" + workingDirectory="$INSTALL_PATH" + description="Stop Tolven PostgreSQL" + programGroup="yes" desktop="yes" applications="no" + startMenu="no" startup="no"> + <createForPack name="short-cuts" /> + </shortcut> <shortcut name="Start Tolven JBoss" target="$INSTALL_PATH\bin\startTolvenJBoss.bat" |
|
From: John C. <jc...@us...> - 2006-10-09 16:11:51
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1/bin In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23768/installer/izpack-8.1/bin Added Files: startTolvenLDAP.bat stopTolvenPG.bat startTolvenPG.bat Log Message: Installer fixes and changes to provide basic and advanced flow --- NEW FILE: stopTolvenPG.bat --- C:\WINDOWS\system32\net.exe stop pgsql-8.1 --- NEW FILE: startTolvenLDAP.bat --- echo "This window will remain open after you enter the LDAP SSL password" cd /d $LDAP_LOCATION slapd.exe -f slapd.conf -h ldaps:// --- NEW FILE: startTolvenPG.bat --- C:\WINDOWS\system32\net.exe start pgsql-8.1 cd /d $DB_LOCATION bin\psql -U postgres -f $INSTALL_PATH\tolven\postgres-config\tolven-database-init.sql |
|
From: Joseph I. <jos...@us...> - 2006-10-09 02:25:14
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15234/security-config Modified Files: build.xml Log Message: Increased the number of valid days for cacert.pem Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** build.xml 8 Oct 2006 04:13:50 -0000 1.52 --- build.xml 9 Oct 2006 02:25:11 -0000 1.53 *************** *** 153,157 **** </exec> <exec dir="${tolven.security.openssl.ca.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="req -passin pass:${tolven.ca.key} -config ${tolven.security.openssl.config} -new -x509 -days 1001 -key keys/private/cakey.pem -out certs/cacert.pem -subj /countryName=${tolven.security.openssl.cert.CountryName}/stateOrProvinceName=${tolven.security.openssl.cert.StateOrProvince}/organizationName="${tolven.security.openssl.cert.OrganizationName}"/organizationalUnitName="${tolven.security.openssl.cert.OrganizationUnitName}"/commonName=${tolven.security.openssl.cert.ca.CommonName}/emailAddress=${tolven.security.openssl.cert.ca.Email}" /> </exec> </target> --- 153,157 ---- </exec> <exec dir="${tolven.security.openssl.ca.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="req -passin pass:${tolven.ca.key} -config ${tolven.security.openssl.config} -new -x509 -days 10000 -key keys/private/cakey.pem -out certs/cacert.pem -subj /countryName=${tolven.security.openssl.cert.CountryName}/stateOrProvinceName=${tolven.security.openssl.cert.StateOrProvince}/organizationName="${tolven.security.openssl.cert.OrganizationName}"/organizationalUnitName="${tolven.security.openssl.cert.OrganizationUnitName}"/commonName=${tolven.security.openssl.cert.ca.CommonName}/emailAddress=${tolven.security.openssl.cert.ca.Email}" /> </exec> </target> |
|
From: Joseph I. <jos...@us...> - 2006-10-08 04:13:53
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17236/security-config Modified Files: build.xml Log Message: The installation should not fail of ldap does not intial. LDAP can be intialized manually afterwards. Also true for windows Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** build.xml 8 Oct 2006 04:09:32 -0000 1.51 --- build.xml 8 Oct 2006 04:13:50 -0000 1.52 *************** *** 789,793 **** <os family="windows"/> </condition> ! <exec dir="${ldap.location}" executable="${ldap-command}"> <arg line="-v -l tolveninitial.ldif -f slapd.conf"/> </exec> --- 789,793 ---- <os family="windows"/> </condition> ! <exec dir="${ldap.location}" executable="${ldap-command}" failonerror="false"> <arg line="-v -l tolveninitial.ldif -f slapd.conf"/> </exec> |
|
From: Joseph I. <jos...@us...> - 2006-10-08 04:09:37
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15608/security-config Modified Files: build.xml Log Message: The installation should not fail of ldap does not intial. LDAP can be intialized manually afterwards. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** build.xml 8 Oct 2006 01:04:53 -0000 1.50 --- build.xml 8 Oct 2006 04:09:32 -0000 1.51 *************** *** 778,782 **** <target name="ldapInit-remote" description="Initialize a Tolven-specific LDAP remote unix server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> ! <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && mkdir -p tolvendata && mkdir -p run && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> <echo level="info" message="You can start the LDAP server (SLAPD) now"/> </target> --- 778,782 ---- <target name="ldapInit-remote" description="Initialize a Tolven-specific LDAP remote unix server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> ! <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && mkdir -p tolvendata && mkdir -p run && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="false" /> <echo level="info" message="You can start the LDAP server (SLAPD) now"/> </target> |
|
From: Joseph I. <jos...@us...> - 2006-10-08 01:04:56
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5392/security-config Modified Files: build.xml Log Message: To mimic windows installation, create run directory under openldap and thus confine our changes to the openldap directory. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** build.xml 5 Oct 2006 08:39:34 -0000 1.49 --- build.xml 8 Oct 2006 01:04:53 -0000 1.50 *************** *** 778,782 **** <target name="ldapInit-remote" description="Initialize a Tolven-specific LDAP remote unix server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> ! <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && mkdir -p tolvendata && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> <echo level="info" message="You can start the LDAP server (SLAPD) now"/> </target> --- 778,782 ---- <target name="ldapInit-remote" description="Initialize a Tolven-specific LDAP remote unix server"> <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> ! <sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} && mkdir -p tolvendata && mkdir -p run && slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" /> <echo level="info" message="You can start the LDAP server (SLAPD) now"/> </target> *************** *** 785,788 **** --- 785,789 ---- <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> <mkdir dir="${ldap.location}/tolvendata" /> + <mkdir dir="${ldap.location}/run" /> <condition property="ldap-command" value="${ldap.location}/slapadd.exe" else="slapadd"> <os family="windows"/> |
|
From: Joseph I. <jos...@us...> - 2006-10-08 01:04:56
|
Update of /cvsroot/tolven/tolven/ldap-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5392/ldap-config Modified Files: slapd_linux.conf Log Message: To mimic windows installation, create run directory under openldap and thus confine our changes to the openldap directory. Index: slapd_linux.conf =================================================================== RCS file: /cvsroot/tolven/tolven/ldap-config/slapd_linux.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** slapd_linux.conf 25 Sep 2006 08:03:04 -0000 1.1 --- slapd_linux.conf 8 Oct 2006 01:04:53 -0000 1.2 *************** *** 15,20 **** #referral ldap://root.openldap.org ! pidfile /var/run/openldap/slapd.pid ! argsfile /var/run/openldap/slapd.args # Load dynamic backend modules: --- 15,20 ---- #referral ldap://root.openldap.org ! pidfile ./run/slapd.pid ! argsfile ./run/slapd.args # Load dynamic backend modules: *************** *** 74,78 **** # be avoided. See slappasswd(8) and slapd.conf(5) for details. # Use of strong authentication encouraged. ! rootpw @slapd-conf-rootpw@ # rootpw {crypt}ijFYNcSNctBYg --- 74,79 ---- # be avoided. See slappasswd(8) and slapd.conf(5) for details. # Use of strong authentication encouraged. ! rootpw {SSHA}LQZjKZroYAl558nNfah14PKC1pc3fwzI ! # rootpw {crypt}ijFYNcSNctBYg |
|
From: John C. <jc...@us...> - 2006-10-07 22:36:07
|
Update of /cvsroot/tolven/tolven/installer/izpack-8.1 In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10751/installer/izpack-8.1 Modified Files: installUserInputSpec.xml tolven-install.xml Log Message: Cosmetic changes to installer creator Index: installUserInputSpec.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/installUserInputSpec.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** installUserInputSpec.xml 5 Oct 2006 08:36:54 -0000 1.5 --- installUserInputSpec.xml 7 Oct 2006 22:36:03 -0000 1.6 *************** *** 10,30 **** <field type="staticText" align="left" txt="If the server requires authentication or not. Many public servers now require authentication." /> ! <field type="radio" variable="MAIL_SMTP_AUTH"> ! <description align="left" ! txt="Mail SMTP Auth:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> <field type="staticText" align="left" txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> ! <field type="radio" variable="MAIL_DEBUG"> ! <description align="left" ! txt="Mail Debug:" /> ! <spec> ! <choice txt="True" value="true" /> ! <choice txt="False" value="false" set="true" /> ! </spec> </field> <field type="rule" variable="MAIL_FROM"> --- 10,20 ---- <field type="staticText" align="left" txt="If the server requires authentication or not. Many public servers now require authentication." /> ! <field type="check" variable="MAIL_SMTP_AUTH"> ! <spec txt="Mail SMTP Auth" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." /> ! <field type="check" variable="MAIL_DEBUG"> ! <spec txt="Mail Debug" true="true" false="false" set="true" /> </field> <field type="rule" variable="MAIL_FROM"> *************** *** 72,80 **** <field type="text" variable="REPOSITORY_OID"> <description align="left" ! txt="The default is fine for the time being since Tolven doesn't yet use it. This must be an globally unique OID (or possibly a UUID) that will be added to any identifier created by Tolven that will be sent to other systems. Uniqueness cannot just be to Tolven, it must be to the instance of the repository. For example, if you create two Tolven repositories, they must each have a unique OID so that identifiers shared between them, or with other systems, are not confused." /> <spec txt="Repository OID:" size="40" set="1.2" /> </field> </panel> <panel order="2"> <field type="title" txt="Invitation" /> <field type="text" variable="INVITATION_HOST"> --- 62,98 ---- <field type="text" variable="REPOSITORY_OID"> <description align="left" ! txt="In operation, this must be an globally unique OID (or possibly a UUID) that will be ! added to any identifier created by Tolven that will be sent to other ! systems. Uniqueness cannot just be to Tolven, it must be to the ! instance of the database (not appllication server). ! For example, if you create two Tolven databases, they must each have a unique OID so ! that identifiers shared between them, or with other systems, ! are not confused. See http://www.hl7.org/oid/index.cfm. ! For standalone testing and development, the default is adequate." /> <spec txt="Repository OID:" size="40" set="1.2" /> </field> </panel> <panel order="2"> + <field type="title" txt="Registration Options" /> + <field type="staticText" align="left" + txt="The login page has two different registration links, one for a normally activated + login and the other creates a demo user without needing email activation. + Turning both off means users can only login to pre-existing accounts." /> + <field type="check" variable="CREATE_DEMO_USER"> + <spec txt="Create Demo User" true="true" false="false" set="true" /> + </field> + <field type="check" variable="ACTIVATE_USER"> + <spec txt="Activate User" true="true" false="false" set="true" /> + </field> + <field type="staticText" align="left" + txt="The two kinds of user registration pages are separate pages. + The fields in each are customized to the type of registration. For example, + creating a demo user account has a separate username (which is NOT an email address) + and an email mail address field which is not verified. The full email-activation page, + on the other hand, requires an email address as user id and it verifies the address via email." /> + <field type="staticText" align="left" + txt="If you would rather not use email activation, uncheck Activate User." /> + </panel> + <panel order="3"> <field type="title" txt="Invitation" /> <field type="text" variable="INVITATION_HOST"> *************** *** 95,123 **** txt="http://InvitationHost:InvitationPort/Tolven/private/dispatch.jsf" /> </panel> ! <panel order="3"> ! <field type="title" txt="Registration Options" /> ! <field type="staticText" align="left" ! txt="The login page has two different registration links, one for a normally activated login and the other creates a demo user without needing email activation. Two tolven.properties have been added which allows you to configure either or both of these options off. (Turning both off means users can only login to pre-existing accounts)." /> ! <field type="radio" variable="CREATE_DEMO_USER"> ! <description align="left" ! txt="Create Demo User:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> ! </field> ! <field type="radio" variable="ACTIVATE_USER"> ! <description align="left" ! txt="Activate User:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> ! </field> ! <field type="staticText" align="left" ! txt="The two kinds of user registration pages are separate pages with no check boxes or options. The fields in each are customized to the type of registration. For example, creating a demo user account has a separate username (which is NOT an email address) and an email mail address field which is not verified. The full email-activation page, on the other hand, requires an email address as user id and it verifies the address via email." /> ! <field type="staticText" align="left" ! txt="If you would rather not use email activation, just disable it using the property shown above." /> ! </panel> <panel order="4"> <field type="title" txt="Timezone" /> --- 113,117 ---- txt="http://InvitationHost:InvitationPort/Tolven/private/dispatch.jsf" /> </panel> ! <panel order="4"> <field type="title" txt="Timezone" /> *************** *** 849,853 **** <field type="rule" variable="LDAP_HOST"> <description align="left" ! txt="Tolven needs to communicate with LDAP in order to create users. (Tolven doesn't handle logins which are done by JAAS)." /> <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> <validator --- 843,847 ---- <field type="rule" variable="LDAP_HOST"> <description align="left" ! txt="Tolven needs to communicate with LDAP in order to create and login users." /> <spec txt="Hostname or IP:" set="0:localhost" layout="O:18:U" /> <validator *************** *** 861,876 **** txt="LDAP Port cannot be blank." /> </field> ! <field type="radio" variable="LDAP_HOST_BROWSABLE"> ! <description align="left" ! txt="Can Browse to LDAP Home Directory:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> <field type="staticText" align="left" ! txt="If True is selected, then browse to the LDAP home directory." /> ! <field type="staticText" align="left" ! txt="If False is selected, then the LDAP home directory on the target machine should be entered into the combo box manually." /> <field type="search" variable="LDAP_LOCATION"> <spec txt="LDAP Home Directory:" type="directory" result="file"> --- 855,863 ---- txt="LDAP Port cannot be blank." /> </field> ! <field type="check" variable="LDAP_HOST_BROWSABLE"> ! <spec txt="Can Browse to LDAP Home Directory" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" ! txt="If checked, then browse to the LDAP home directory." /> <field type="search" variable="LDAP_LOCATION"> <spec txt="LDAP Home Directory:" type="directory" result="file"> *************** *** 880,884 **** </field> <field type="staticText" align="left" ! txt="The information below is only required if the 'Can Browse to LDAP Home Directory' set to False:" /> <field type="text" variable="LDAP_HOST_USER"> <description align="left" --- 867,871 ---- </field> <field type="staticText" align="left" ! txt="If 'Can Browse to LDAP Home Directory' is not checked, then the LDAP home directory on the target machine should be entered into the combo box manually." /> <field type="text" variable="LDAP_HOST_USER"> <description align="left" *************** *** 924,929 **** <spec> <pwd txt="LDAP KeyStore Password:" size="20" ! set="changeit" /> ! <pwd txt="Retype password" size="20" set="changeit" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" --- 911,916 ---- <spec> <pwd txt="LDAP KeyStore Password:" size="20" ! set="tolven" /> ! <pwd txt="Retype password" size="20" set="tolven" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" *************** *** 957,974 **** txt="Port cannot be blank." /> </field> ! <field type="radio" variable="DB_HOST_BROWSABLE"> ! <description align="left" ! txt="Can Browse to Postgresql Home Directory:" /> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> <field type="staticText" align="left" ! txt="If True is selected, then browse to the Postgresql home directory." /> <field type="staticText" align="left" ! txt="If False is selected, then the Postgresql home directory on the target machine should be entered into the combo box manually." /> <field type="search" variable="DB_LOCATION"> ! <spec txt="Postgresql Home Directory:" type="directory" result="file"> <choice value="/var/lib/pgsql" os="unix" /> <choice value="c:\postgreSQL\8.1" os="windows" /> --- 944,958 ---- txt="Port cannot be blank." /> </field> ! <field type="check" variable="DB_HOST_BROWSABLE"> ! <spec txt="Can Browse to PostgreSQL Home Directory" true="true" false="false" set="true" /> </field> <field type="staticText" align="left" ! txt="If checked, then browse to the PostgreSQL home directory." /> <field type="staticText" align="left" ! txt="If not checked, then the PostgreSQL home directory on the target machine ! should be entered into the combo box manually." /> <field type="search" variable="DB_LOCATION"> ! <spec txt="PostgreSQL Home Directory:" type="directory" ! result="file"> <choice value="/var/lib/pgsql" os="unix" /> <choice value="c:\postgreSQL\8.1" os="windows" /> *************** *** 976,980 **** </field> <field type="staticText" align="left" ! txt="The information below is only required if the 'Can Browse to Postgresql Home' radio button is set to false." /> <field type="text" variable="DB_HOST_USER"> <description align="left" --- 960,964 ---- </field> <field type="staticText" align="left" ! txt="The information below is only required if the 'Can Browse to Postgresql Home' checkbox is unchecked." /> <field type="text" variable="DB_HOST_USER"> <description align="left" *************** *** 1019,1024 **** txt="Please enter a keystore password to protect the postgres password" /> <spec> ! <pwd txt="Keystore Password:" size="20" set="changeit" /> ! <pwd txt="Retype Password:" size="20" set="changeit" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" --- 1003,1008 ---- txt="Please enter a keystore password to protect the postgres password" /> <spec> ! <pwd txt="Keystore Password:" size="20" set="tolven" /> ! <pwd txt="Retype Password:" size="20" set="tolven" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" *************** *** 1040,1059 **** txt="Postgresql clients will need a client certificate to communicate with the Postgresql database (this is usually found in the postgresql directory located in the user's home directory on a unix system or the 'Application Data/postgresql' directory in the user's home directory on windows." /> <field type="staticText" align="left" ! txt="Click true if existing client certificate should be be modified with the required Postgresql database certificate. In addition, if one does not exist, it will be created." /> ! <field type="staticText" align="left" ! txt="Click false, if a new certificate should always be copied to the client directory, replacing any that already exists." /> ! <field type="radio" variable="USE_PG_CLIENT_CERT"> ! <spec> ! <choice txt="True" value="true" set="true" /> ! <choice txt="False" value="false" /> ! </spec> </field> </panel> <panel order="9"> ! <field type="title" txt="JBoss" /> ! <field type="staticText" align="left" ! txt="JBoss is by default installed in the installation directory." /> ! <field type="staticText" align="left" ! txt="After Installtion, it can be moved provided the corresponding property jboss.location in the ant-build.properties file is also updated." /> <field type="rule" variable="JBOSS_HOST"> <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> --- 1024,1037 ---- txt="Postgresql clients will need a client certificate to communicate with the Postgresql database (this is usually found in the postgresql directory located in the user's home directory on a unix system or the 'Application Data/postgresql' directory in the user's home directory on windows." /> <field type="staticText" align="left" ! txt="Check if existing client certificate should be be modified ! with the required PostgreSQL database certificate. If one does not exist, ! it will be created. Uncheck if a new certificate should always be copied to ! the client directory, replacing any that already exists." /> ! <field type="check" variable="USE_PG_CLIENT_CERT"> ! <spec txt="Use existing client credentials, if found" true="true" false="false" set="false" /> </field> </panel> <panel order="9"> ! <field type="title" txt="JBoss (Tomcat) Web Server" /> <field type="rule" variable="JBOSS_HOST"> <spec txt="WebServer Hostname or IP:" set="0:localhost" layout="O:18:U" /> *************** *** 1117,1122 **** txt="Please enter single password for all keys and stores" /> <spec> ! <pwd txt="Single Password:" size="20" set="changeit" /> ! <pwd txt="Retype password" size="20" set="changeit" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" --- 1095,1100 ---- txt="Please enter single password for all keys and stores" /> <spec> ! <pwd txt="Single Password:" size="20" set="tolven" /> ! <pwd txt="Retype password" size="20" set="tolven" /> </spec> <validator class="com.izforge.izpack.util.PWDValidator" Index: tolven-install.xml =================================================================== RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tolven-install.xml 2 Oct 2006 06:49:03 -0000 1.8 --- tolven-install.xml 7 Oct 2006 22:36:03 -0000 1.9 *************** *** 2,17 **** <installation version="1.0"> <info> ! tolvenB20060927 ! <appname>Tolven Full Installation</appname> ! <appversion>alpha1</appversion> <appsubpath>tolvenHome</appsubpath> <authors> <author name="John Churin" ! email="joh...@to..." /> <author name="Joseph Isaac" ! email="jos...@to..." /> </authors> <uninstaller>uninstall-tolven.jar</uninstaller> ! <url>http://www.tolvenhealth.org/</url> <javaversion>1.5</javaversion> </info> --- 2,16 ---- <installation version="1.0"> <info> ! <appname>Tolven</appname> ! <appversion>alpha3</appversion> <appsubpath>tolvenHome</appsubpath> <authors> <author name="John Churin" ! email="jc...@us..." /> <author name="Joseph Isaac" ! email="jos...@us..." /> </authors> <uninstaller>uninstall-tolven.jar</uninstaller> ! <url>http://www.tolven.org/</url> <javaversion>1.5</javaversion> </info> *************** *** 26,31 **** <resources> <res id="installer.langsel.img" src="../images/tolven-logo.png" /> - <res id="LicencePanel.licence" src="../../lgpl.txt" /> <res id="InfoPanel.info" src="../../readme.txt" /> <res id="TargetPanel.dir.unix" src="../../build/izpack-8.1/cvstag_dirname_unix.txt" /> <res id="TargetPanel.dir.windows" --- 25,31 ---- <resources> <res id="installer.langsel.img" src="../images/tolven-logo.png" /> <res id="InfoPanel.info" src="../../readme.txt" /> + <res id="LicencePanel.licence" src="../../lgpl.txt" /> + <res id="HTMLInfoPanel.info" src="../doc/dependencies.html" /> <res id="TargetPanel.dir.unix" src="../../build/izpack-8.1/cvstag_dirname_unix.txt" /> <res id="TargetPanel.dir.windows" *************** *** 40,45 **** <panels> <panel classname="HelloPanel" /> - <panel classname="InfoPanel" /> <panel classname="LicencePanel" /> <panel classname="JDKPathPanel" /> <panel classname="TargetPanel" /> --- 40,45 ---- <panels> <panel classname="HelloPanel" /> <panel classname="LicencePanel" /> + <panel classname="HTMLInfoPanel" /> <panel classname="JDKPathPanel" /> <panel classname="TargetPanel" /> *************** *** 160,164 **** <pack name="deploy-db-from-stage" required="yes"> <description> ! Deploy To Postgresql From Tolven Stage </description> <depends packname="install-tolven-jboss.4.0.4.GA" /> --- 160,164 ---- <pack name="deploy-db-from-stage" required="yes"> <description> ! Deploy To PostgreSQL From Tolven Stage </description> <depends packname="install-tolven-jboss.4.0.4.GA" /> *************** *** 173,177 **** required="yes"> <description> ! Deploy To Postgresql Client From Tolven Stage </description> <depends packname="install-tolven-jboss.4.0.4.GA" /> --- 173,177 ---- required="yes"> <description> ! Deploy To PostgreSQL Client From Tolven Stage </description> <depends packname="install-tolven-jboss.4.0.4.GA" /> |
|
From: John C. <jc...@us...> - 2006-10-07 22:36:07
|
Update of /cvsroot/tolven/tolven/installer/doc In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10751/installer/doc Added Files: dependencies.html Log Message: Cosmetic changes to installer creator --- NEW FILE: dependencies.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <title>Tolven Installation</title> <style type="text/css"> <!-- h3 { border-bottom-width: thin; border-bottom-style: solid; border-bottom-color: #000000; } .cmd { background-color: #CCCCCC; } --> </style> </head> <body> <h2>Tolven Installation Dependencies </h2> <p>Prior to installing Tolven, you <strong>must</strong> first install dependent software components including a Java 5 JDK (nothing older will work), a PostgreSQL database, and an openLDAP server. If you have not installed these components, follow the instructions in Install Dependent Components at http://www.tolven.org/setup/install-dependencies.html and then return to this installer. </p> |
|
From: John C. <jc...@us...> - 2006-10-07 22:25:36
|
Update of /cvsroot/tolven/tolven/installer/doc In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7618/installer/doc Log Message: Directory /cvsroot/tolven/tolven/installer/doc added to the repository |
3 messages has been excluded from this view by a project administrator.
