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-09-03 00:35:33
|
Update of /cvsroot/tolven/tolvenWEB/web/five In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1171/web/five Modified Files: login.xhtml Log Message: Cleanup wording on login page. Index: login.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/five/login.xhtml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** login.xhtml 25 Aug 2006 15:00:37 -0000 1.5 --- login.xhtml 3 Sep 2006 00:35:29 -0000 1.6 *************** *** 35,46 **** <p>You are logging into a demo database. While Tolven makes every effort to protect data, this installation has not been certified as secure. Do not enter real patient ! data or any secrets. For example, consider using simple passwords such as your first name, not your regular password. (We've kept the password and account requirements simple for the demo). </p> ! <p>Once you get logged in and have selected an account you may want to generate some ! artificial patient data. To do so, see <a href="http://www.tolven.org/setup/generator.html" target="_blank">Generator</a></p> <p>This application is still under development. You should expect changes ! frequently and without warning. Some pages don't work at all. We hope all ! changes will be positive. In either case, please feel free to drop us a line at <a href="mailto:in...@to...">in...@to...</a> with your thoughts.</p> </div> --- 35,47 ---- <p>You are logging into a demo database. While Tolven makes every effort to protect data, this installation has not been certified as secure. Do not enter real patient ! medical data or any secrets. For example, consider using a simple password such as your first name, not your regular password. (We've kept the password and account requirements simple for the demo). </p> ! <p>You may want to generate some ! artificial patient data. To do so, click the checkbox on the Select Account page ! will be the first page you see after you login to this page.</p> <p>This application is still under development. You should expect changes ! frequently and without warning. Some pages don't work at all, yet. ! Please feel free to drop us a line at <a href="mailto:in...@to...">in...@to...</a> with your thoughts.</p> </div> |
|
From: John C. <jc...@us...> - 2006-09-03 00:34:53
|
Update of /cvsroot/tolven/tolvenWEB/web/WEB-INF In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv758/web/WEB-INF Modified Files: jboss-web.xml Log Message: Context-Root is set in application.xml, not here. Index: jboss-web.xml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/WEB-INF/jboss-web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jboss-web.xml 22 Jun 2006 00:23:16 -0000 1.1 --- jboss-web.xml 3 Sep 2006 00:34:52 -0000 1.2 *************** *** 2,5 **** <jboss-web> <security-domain>java:/jaas/tolvenLDAP</security-domain> - <context-root>/Tolven</context-root> </jboss-web> --- 2,4 ---- |
|
From: John C. <jc...@us...> - 2006-09-03 00:33:25
|
Update of /cvsroot/tolven/tolvenWEB/src/org/tolven/web In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv316/src/org/tolven/web Modified Files: MenuAction.java Log Message: Remove old debug message Index: MenuAction.java =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/src/org/tolven/web/MenuAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** MenuAction.java 28 Aug 2006 19:37:40 -0000 1.18 --- MenuAction.java 3 Sep 2006 00:33:21 -0000 1.19 *************** *** 257,261 **** public DocCCR getDocCCR( ) throws Exception { MenuData md = getMenuDataItem(); ! System.out.println( "[getDocCCR] MD.id=" + md.getId()); DocBase doc = md.getDocument(); if (doc==null) { --- 257,261 ---- public DocCCR getDocCCR( ) throws Exception { MenuData md = getMenuDataItem(); ! // System.out.println( "[getDocCCR] MD.id=" + md.getId()); DocBase doc = md.getDocument(); if (doc==null) { |
|
From: John C. <jc...@us...> - 2006-09-02 22:33:34
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13397/template Modified Files: ant-build.template Log Message: The download target has been removed from build.xml and therefore the tolven.dist properties are no longer needed. Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ant-build.template 1 Sep 2006 08:26:09 -0000 1.40 --- ant-build.template 2 Sep 2006 22:33:31 -0000 1.41 *************** *** 64,83 **** tolven.security.openssl.cert.pg.client.Email=tol...@to... - # These locations are only used to build the tolven /lib directory - # normally you can ignore these - tolven.dist.jaxb.location=c:/jaxb-ri-20060426 - tolven.dist.commons-codec.location=c:/commons-codec-1.3 - tolven.dist.commons-math.location=c:/commons-math-1.1 - tolven.dist.javamail.location=c:/javamail-1.4ea - tolven.dist.jaf.location=c:/jaf-1.0.2 - tolven.dist.httpcore.location=c:/jakarta-httpcore-4.0-alpha1 - tolven.dist.junit.location=c:/eclipse/plugins/org.junit_3.8.1 - tolven.dist.facelets.location=c:/facelets-1.1.11 - tolven.dist.commons-fileupload.location=c:/commons-fileupload-1.1 - tolven.dist.commons-io.location=c:/commons-io-1.2 - tolven.dist.jsf.location=c:/jsf-1.2-b20-FCS - tolven.dist.openSSL.location=c:/OpenSSL - tolven.dist.openLDAP.location=c:/OpenLDAP - # Normally, these don't change tolven.location=${tolven.home}/tolven --- 64,67 ---- |
|
From: John C. <jc...@us...> - 2006-09-02 22:29:53
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11422 Modified Files: build.xml Log Message: Remove incomplete downloadlibs target - it didn't work anyway. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** build.xml 2 Sep 2006 03:06:08 -0000 1.49 --- build.xml 2 Sep 2006 22:29:49 -0000 1.50 *************** *** 266,317 **** </delete> </target> - <target name="downloadLibs"> - <get src="http://labs.jboss.com/file-access/default/members/jbossmessaging/downloads/jboss-messaging-1.0.1.CR3.zip" - dest="work/jboss-messaging-1.0.1.CR3.zip" - verbose="true" - usetimestamp="true"/> - <unzip src="work/jboss-messaging-1.0.1.CR3.zip" dest="libs"/> - <get src="http://jdbc.postgresql.org/download/postgresql-8.1-407.jdbc3.jar" - dest="jboss-config/postgresql-8.1-407.jdbc3.jar" - verbose="true" - usetimestamp="true"/> - - <get src="http://umn.dl.sourceforge.net/sourceforge/junit/junit4.1.zip" - dest="work/junit4.1.zip" - verbose="true" - usetimestamp="true"/> - <unzip src="work/junit4.1.zip" dest="libs"/> - <unzip src="bundled/jsf-1_2.zip" dest="libs"/> - <unzip src="bundled/facelets-1.0.14.zip" dest="libs"/> - <get src="http://www.ibiblio.org/pub/mirrors/apache/jakarta/httpcomponents/httpcore/binary/jakarta-httpcore-4.0-alpha2-bin.tar.gz" - dest="work/jakarta-httpcore-4.0-alpha2-bin.tar.gz" - verbose="true" - usetimestamp="true"/> - <gunzip src="work/jakarta-httpcore-4.0-alpha2-bin.tar.gz"/> - <untar src="work/jakarta-httpcore-4.0-alpha2-bin.tar" dest="libs"/> - <get src="http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/io/binaries/commons-io-1.2.tar.gz" - dest="work/commons-io-1.2.tar.gz" - verbose="true" - usetimestamp="true"/> - <gunzip src="work/commons-io-1.2.tar.gz"/> - <untar src="work/commons-io-1.2.tar" dest="libs"/> - <get src="http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/codec/binaries/commons-codec-1.3.tar.gz" - dest="work/commons-codec-1.3.tar.gz" - verbose="true" - usetimestamp="true"/> - <gunzip src="work/commons-codec-1.3.tar.gz"/> - <untar src="work/commons-codec-1.3.tar" dest="libs/commons-codec-1.3"/> - <get src="http://www.ibiblio.org/pub/mirrors/apache/jakarta/commons/fileupload/binaries/commons-fileupload-1.1.1.tar.gz" - dest="work/commons-fileupload-1.1.1.tar.gz" - verbose="true" - usetimestamp="true"/> - <gunzip src="work/commons-fileupload-1.1.1.tar.gz"/> - <untar src="work/commons-fileupload-1.1.1.tar" dest="libs"/> - <get src="https://jaxb.dev.java.net/jaxb20-fcs/JAXB2_20060426.jar" - dest="work/JAXB2_20060426.jar" - verbose="true" - usetimestamp="true"/> - <java jar="work/JAXB2_20060426.jar" dir="libs" fork="true"/> - </target> </project> \ No newline at end of file --- 266,269 ---- |
|
From: Joseph I. <jos...@us...> - 2006-09-02 08:11:31
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20473 Modified Files: .cvsignore Log Message: added libs directory Index: .cvsignore =================================================================== RCS file: /cvsroot/tolven/tolven/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 2 Sep 2006 08:04:19 -0000 1.3 --- .cvsignore 2 Sep 2006 08:11:28 -0000 1.4 *************** *** 7,9 **** stage build ! work \ No newline at end of file --- 7,10 ---- stage build ! work ! libs \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-09-02 08:04:22
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17515 Modified Files: .cvsignore Log Message: Ignore work directory Index: .cvsignore =================================================================== RCS file: /cvsroot/tolven/tolven/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 2 Sep 2006 02:04:46 -0000 1.2 --- .cvsignore 2 Sep 2006 08:04:19 -0000 1.3 *************** *** 6,8 **** .project stage ! build \ No newline at end of file --- 6,9 ---- .project stage ! build ! work \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-09-02 03:06:11
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26711 Modified Files: build.xml Log Message: tolvon-properties-service.xml still does not have a hidden password, but at least it is now consistent with the credential creation process, until it is. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** build.xml 2 Sep 2006 02:04:46 -0000 1.48 --- build.xml 2 Sep 2006 03:06:08 -0000 1.49 *************** *** 95,103 **** --- 95,112 ---- <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> + <!-- Need to migrate to hiding the password required by the JSSE in tolven-properties-service.xml. Then thsi can be uncommented --> + <!-- <include name="tolven-properties-service.xml"/> + --> <include name="tolven-ldap-service.xml"/> <include name="tolven-ds.xml"/> </fileset> </copy> + <!-- Need to migrate to hiding the password required by the JSSE, then the next tolven-properties-service.xml copy is no longer required --> + <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> + <fileset dir="${tolven.stage}/misc"> + <include name="tolven-properties-service.xml"/> + </fileset> + </copy> </target> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 03:06:11
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26711/security-config Modified Files: build.xml Log Message: tolvon-properties-service.xml still does not have a hidden password, but at least it is now consistent with the credential creation process, until it is. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** build.xml 2 Sep 2006 02:04:46 -0000 1.33 --- build.xml 2 Sep 2006 03:06:08 -0000 1.34 *************** *** 427,430 **** --- 427,437 ---- </fileset> </move> + <!-- Need to migrate to a way to hiding the password required by the JSSE, then this section is no longer required --> + <filter token="tolven-jboss-password" value="${tolven.jboss.keystore}"/> + <copy toDir="${tolven.stage}/misc" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> + <fileset dir="${tolven.location}/jboss-config"> + <include name="tolven-properties-service.xml"/> + </fileset> + </copy> <echo level="info" message="The JBoss ldapserver.password and pgserver.password have been placed in ${tolven.stage}/jboss-server/conf" /> <echo level="info" message="The JBoss keystore and truststore are located in ${tolven.stage}/jboss-server/conf" /> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 03:06:10
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26711/jboss-config Modified Files: tolven-properties-service.xml Log Message: tolvon-properties-service.xml still does not have a hidden password, but at least it is now consistent with the credential creation process, until it is. Index: tolven-properties-service.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/tolven-properties-service.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tolven-properties-service.xml 13 Aug 2006 19:12:28 -0000 1.5 --- tolven-properties-service.xml 2 Sep 2006 03:06:08 -0000 1.6 *************** *** 55,59 **** <attribute name="Properties"> javax.net.ssl.keyStore=@deploy.location.conf@/tolvendev-jboss.jks ! javax.net.ssl.keyStorePassword=changeit javax.net.ssl.trustStore=@deploy.location.conf@/tolvendev-jboss-cacerts.jks </attribute> --- 55,59 ---- <attribute name="Properties"> javax.net.ssl.keyStore=@deploy.location.conf@/tolvendev-jboss.jks ! javax.net.ssl.keyStorePassword=@tolven-jboss-password@ javax.net.ssl.trustStore=@deploy.location.conf@/tolvendev-jboss-cacerts.jks </attribute> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 02:04:49
|
Update of /cvsroot/tolven/tolven/jboss-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1486/jboss-config Modified Files: server.xml Log Message: Tie the tomcat password into the certificate creation process, although it is still necessary to implement tomcat's method of hiding passwords Index: server.xml =================================================================== RCS file: /cvsroot/tolven/tolven/jboss-config/server.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** server.xml 13 Aug 2006 08:29:33 -0000 1.2 --- server.xml 2 Sep 2006 02:04:46 -0000 1.3 *************** *** 33,37 **** scheme="https" secure="true" clientAuth="false" keystoreFile="${jboss.server.home.dir}/conf/tolvendev-webserver.jks" ! keystorePass="changeit" sslProtocol = "TLS" /> --- 33,37 ---- scheme="https" secure="true" clientAuth="false" keystoreFile="${jboss.server.home.dir}/conf/tolvendev-webserver.jks" ! keystorePass="@tolven-webserver-password@" sslProtocol = "TLS" /> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 02:04:49
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1486 Modified Files: build.xml .cvsignore Log Message: Tie the tomcat password into the certificate creation process, although it is still necessary to implement tomcat's method of hiding passwords Index: .cvsignore =================================================================== RCS file: /cvsroot/tolven/tolven/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 1 Sep 2006 06:52:39 -0000 1.1 --- .cvsignore 2 Sep 2006 02:04:46 -0000 1.2 *************** *** 5,7 **** .packaging .project ! stage \ No newline at end of file --- 5,8 ---- .packaging .project ! stage ! build \ No newline at end of file Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** build.xml 1 Sep 2006 08:26:09 -0000 1.47 --- build.xml 2 Sep 2006 02:04:46 -0000 1.48 *************** *** 9,14 **** <target name="stage-init-all"> - <fail unless="tolven.stage" message="tolven.stage must be set in ant-build.properties" /> - <delete dir="${tolven.stage}" /> <ant target="stage-init" /> <ant target="stage-init-generate-credentials" /> --- 9,12 ---- *************** *** 18,21 **** --- 16,20 ---- <target name="stage-init"> <fail unless="tolven.stage" message="tolven.stage must be set in ant-build.properties" /> + <delete dir="${tolven.stage}" /> <mkdir dir="${tolven.stage}/ldap-deploy-location" /> <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" > *************** *** 86,89 **** --- 85,90 ---- </fileset> </copy> + <!-- Need to find out how tomcat hides passwords, so this is now temporarily handled in the tolven/security-config/build.xml --> + <!-- <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> *************** *** 91,94 **** --- 92,96 ---- </fileset> </copy> + --> <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 02:04:48
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1486/security-config Modified Files: build.xml Log Message: Tie the tomcat password into the certificate creation process, although it is still necessary to implement tomcat's method of hiding passwords Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** build.xml 1 Sep 2006 15:06:10 -0000 1.32 --- build.xml 2 Sep 2006 02:04:46 -0000 1.33 *************** *** 355,358 **** --- 355,359 ---- <ant target="update-tolven-stage-jboss" /> <ant target="update-tolven-stage-misc" /> + <ant target="update-tolven-stage-tomcat" /> <ant target="display-tolvendev-ca-cert" /> <ant target="display-tolvendev-ldap-cert" /> *************** *** 448,451 **** --- 449,461 ---- </target> + <target name="update-tolven-stage-tomcat" description="Initialize Postgres for Tolven"> + <filter token="tolven-webserver-password" value="${tolven.webserver.key}"/> + <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> + <fileset dir="${tolven.location}/jboss-config"> + <include name="server.xml"/> + </fileset> + </copy> + </target> + <target name="deploy-credentials" description="Initialize LDAP for Tolven"> <ant target="deploy-ldap-credentials" /> |
|
From: Joseph I. <jos...@us...> - 2006-09-02 01:57:25
|
Update of /cvsroot/tolven/tolvenEJB In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30933 Modified Files: .cvsignore Log Message: Ignore build directory Index: .cvsignore =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 1 Sep 2006 06:52:42 -0000 1.2 --- .cvsignore 2 Sep 2006 01:57:22 -0000 1.3 *************** *** 4,6 **** .classpath .packaging ! .project \ No newline at end of file --- 4,7 ---- .classpath .packaging ! .project ! build \ No newline at end of file |
|
From: John C. <jc...@us...> - 2006-09-01 15:06:19
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18396/security-config Modified Files: build.xml Log Message: Remove extra brace in two places Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** build.xml 1 Sep 2006 08:26:10 -0000 1.31 --- build.xml 1 Sep 2006 15:06:10 -0000 1.32 *************** *** 510,514 **** <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> --- 510,514 ---- <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> *************** *** 521,525 **** <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> ! <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="server.crt"/> <include name="server.key"/> --- 521,525 ---- <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> ! <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="server.crt"/> <include name="server.key"/> |
|
From: Joseph I. <jos...@us...> - 2006-09-01 08:26:12
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13271/security-config Modified Files: build.xml Log Message: Added more echo comments Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** build.xml 1 Sep 2006 05:12:59 -0000 1.30 --- build.xml 1 Sep 2006 08:26:10 -0000 1.31 *************** *** 78,82 **** <target name="all" depends="password-input"> <delete dir="${tolven.security.build.dir}" /> ! <ant target="create-ca" /> <ant target="create-tolvendev-ldap-cert" /> <ant target="create-tolvendev-db-cert" /> --- 78,82 ---- <target name="all" depends="password-input"> <delete dir="${tolven.security.build.dir}" /> ! <ant target="create-tolvendev-ca-cert" /> <ant target="create-tolvendev-ldap-cert" /> <ant target="create-tolvendev-db-cert" /> *************** *** 92,96 **** </target> ! <target name="create-ca" depends="password-input"> <mkdir dir="${tolven.security.openssl.ca.dir}" /> <mkdir dir="${tolven.security.openssl.ca.dir}/certs" /> --- 92,96 ---- </target> ! <target name="create-tolvendev-ca-cert" depends="password-input"> <mkdir dir="${tolven.security.openssl.ca.dir}" /> <mkdir dir="${tolven.security.openssl.ca.dir}/certs" /> *************** *** 98,104 **** <mkdir dir="${tolven.security.openssl.ca.dir}/keys/private" /> <mkdir dir="${tolven.security.openssl.ca.dir}/requests" /> ! <copy file="${tolven.location}/security-config/openssl.conf" toDir="${tolven.security.openssl.ca.dir}" /> ! <copy file="${tolven.location}/security-config/database.txt" toDir="${tolven.security.openssl.ca.dir}" /> ! <copy file="${tolven.location}/security-config/serial.txt" toDir="${tolven.security.openssl.ca.dir}" /> <exec dir="${tolven.security.openssl.ca.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> <arg line="genrsa -des3 -passout pass:${tolven.ca.key} -out keys/private/cakey.pem 1024 " /> --- 98,104 ---- <mkdir dir="${tolven.security.openssl.ca.dir}/keys/private" /> <mkdir dir="${tolven.security.openssl.ca.dir}/requests" /> ! <copy file="${tolven.location}/security-config/openssl.conf" toDir="${tolven.security.openssl.ca.dir}" verbose="${message.show.copy}" /> ! <copy file="${tolven.location}/security-config/database.txt" toDir="${tolven.security.openssl.ca.dir}" verbose="${message.show.copy}" /> ! <copy file="${tolven.location}/security-config/serial.txt" toDir="${tolven.security.openssl.ca.dir}" verbose="${message.show.copy}" /> <exec dir="${tolven.security.openssl.ca.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> <arg line="genrsa -des3 -passout pass:${tolven.ca.key} -out keys/private/cakey.pem 1024 " /> *************** *** 120,126 **** </exec> <move file="${tolven.security.openssl.ca.dir}/tolvendev-ldap-cert.pem" toDir="${tolven.security.openssl.ldap.dir}" /> - <echo level="info" message="The LDAP certificate is located in ${tolven.security.openssl.ldap.dir}" /> - <echo level="info" message="tolvendev-ldap-cert.pem specifies the file that contains the slapd server certificate, referenced by slap.conf's TLSCertificateFile directive" /> - <echo level="info" message="tolvendev-ldap-key.pem specifies the file that contains the private key that matches the certificate, referenced by slap.conf's TLSCertificateKeyFile directive" /> </target> --- 120,123 ---- *************** *** 139,151 **** <arg line="rsa -passin pass:${tolven.db.key} -in ${tolven.security.openssl.db.dir}/tolvendev-db-key.pem -out ${tolven.security.openssl.db.dir}/server.key" /> </exec> - <echo level="info" message="The DB certificate is located in ${tolven.security.openssl.db.dir}" /> - <echo level="info" message="server.crt specifies the file that contains the db server certificate" /> - <echo level="info" message="server.key specifies the file that contains the db private key" /> - <echo level="info" message="IMPORTANT: NOTE THAT FOR POSTGRES THE PASSWORD HAS BEEN REMOVED FROM server.key" /> - <echo level="info" message="For postgres, server.crt, server.key and root.crt are placed in posgres' data directory" /> </target> <target name="create-tolvendev-jboss-keystore" depends="password-input"> - <echo level="info" message="Creating JBoss certificate" /> <mkdir dir="${tolven.security.openssl.jboss.dir}" /> <exec dir="${tolven.security.openssl.jboss.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> --- 136,142 ---- *************** *** 174,178 **** <arg line="-import -noprompt -keystore tolvendev-jboss.jks -keypass ${tolven.jboss.keystore.jboss.key} -storepass ${tolven.jboss.keystore} -alias tolven-demo-jboss-host -file tolvendev-jboss-cert.der" /> </exec> - <echo level="info" message="The JBoss keystore is located in ${tolven.security.openssl.jboss.dir}" /> </target> --- 165,168 ---- *************** *** 182,187 **** <filelist dir="${tolven.security.openssl.jboss.dir}" files="tolvendev-jboss-cert.pem" /> </concat> - <echo level="info" message="The LDAP truststore is located in ${tolven.security.openssl.ldap.dir}" /> - <echo level="info" message="tolvendev-ldap-cacerts.pem specifies the PEM-format file containing certificates for the CA's that slapd will trust, referenced by slap.conf's TLSCACertificateFile directive" /> </target> --- 172,175 ---- *************** *** 199,204 **** </condition> <ant target="${db-client-target}" /> - <echo level="info" message="The db truststore is located in ${tolven.security.openssl.db.dir}" /> - <echo level="info" message="root.crt specifies the PEM-format file containing certificates for the CA's that postgresql will trust" /> </target> --- 187,190 ---- *************** *** 208,212 **** <filelist dir="${postgres-client-cert-dir}" files="postgresql.crt" /> </concat> ! <echo level="info" message="The Client certificate postgresql.crt has been included in the db truststore" /> </target> --- 194,198 ---- <filelist dir="${postgres-client-cert-dir}" files="postgresql.crt" /> </concat> ! <echo level="info" message="The Client certificate postgresql.crt have been included in the db truststore" /> </target> *************** *** 225,230 **** <arg line="-import -noprompt -keystore tolvendev-jboss-cacerts.jks -keypass ${tolven.jboss.truststore.db.key} -storepass ${tolven.jboss.truststore} -alias tolven-demo-db-host -file tolvendev-db-cert.der" /> </exec> - <echo level="info" message="The JBoss truststore is located in ${tolven.security.openssl.jboss.dir}" /> - <echo level="info" message="tolvendev-jboss-cacerts.jks specifies the Java Key Store-format file containing certificates for the CA's that JBoss will trust, and is placed in ${deploy.location}/conf" /> </target> --- 211,214 ---- *************** *** 235,240 **** <arg line="-genkey -keystore tolvendev-webserver.jks -keypass ${tolven.webserver.key} -storepass ${tolven.webserver.keystore} -alias tolven-demo-webserver-host -validity 10000 -dname "cn=${tolven.security.openssl.cert.CountryName} s=${tolven.security.openssl.cert.StateOrProvince} o='${tolven.security.openssl.cert.OrganizationName}' ou=${tolven.security.openssl.cert.OrganizationUnitName} cn=${tolven.security.openssl.cert.webserver.CommonName}"" /> </exec> - <echo level="info" message="The WebServer keystore is located in ${tolven.security.openssl.webserver.dir}" /> - <echo level="info" message="Forced to use a self-signed certificated for this demo because some browsers will not support one signed otherwise, unless the signer is locally installed" /> </target> --- 219,222 ---- *************** *** 311,325 **** <replace file="${tolven.security.openssl.db.dir}/hashed-pgserver.password" token="Encoded password: " value=""/> </target> ! ! <target name="display-tolvendev-ldap-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.stage}/ldap-deploy-location/tolvendev-ldap-cert.pem" /> </exec> </target> ! <target name="display-tolvendev-ldap-cacerts"> ! <concat> ! <filelist dir="${tolven.stage}/ldap-deploy-location" files="tolvendev-ldap-cacerts.pem" /> ! </concat> </target> --- 293,307 ---- <replace file="${tolven.security.openssl.db.dir}/hashed-pgserver.password" token="Encoded password: " value=""/> </target> ! ! <target name="display-tolvendev-ca-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.stage}/ca/certs/cacert.pem" /> </exec> </target> ! <target name="display-tolvendev-ldap-cert"> ! <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.stage}/ldap-deploy-location/tolvendev-ldap-cert.pem" /> ! </exec> </target> *************** *** 330,339 **** </target> - <target name="display-tolvendev-db-cacerts"> - <concat> - <filelist dir="${tolven.stage}/postgres-deploy-location/data" files="root.crt" /> - </concat> - </target> - <target name="display-tolvendev-jboss-keystore"> <input message="Please enter password for JBoss key store" addproperty="tolven.jboss.keystore" /> --- 312,315 ---- *************** *** 343,346 **** --- 319,334 ---- </target> + <target name="display-tolvendev-ldap-cacerts"> + <concat> + <filelist dir="${tolven.stage}/ldap-deploy-location" files="tolvendev-ldap-cacerts.pem" /> + </concat> + </target> + + <target name="display-tolvendev-db-cacerts"> + <concat> + <filelist dir="${tolven.stage}/postgres-deploy-location/data" files="root.crt" /> + </concat> + </target> + <target name="display-tolvendev-jboss-cacerts"> <input message="Please enter password for JBoss trust store" addproperty="tolven.jboss.truststore" /> *************** *** 361,364 **** --- 349,353 ---- <mkdir dir="${tolven.stage}" /> <move toDir="${tolven.stage}" file="${tolven.security.openssl.ca.dir}" /> + <echo message="${tolven.stage}/ca contains the CA certificate and key used to sign all certificates. It, and all private keys, should be carefully protected." /> <ant target="update-tolven-stage-ldap" /> <ant target="update-tolven-stage-pg" /> *************** *** 366,369 **** --- 355,359 ---- <ant target="update-tolven-stage-jboss" /> <ant target="update-tolven-stage-misc" /> + <ant target="display-tolvendev-ca-cert" /> <ant target="display-tolvendev-ldap-cert" /> <ant target="display-tolvendev-db-cert" /> *************** *** 385,388 **** --- 375,382 ---- </fileset> </move> + <echo level="info" message="The LDAP certificates are located in ${tolven.stage}/ldap-deploy-location" /> + <echo level="info" message="tolvendev-ldap-cert.pem specifies the file that contains the slapd server certificate, referenced by slap.conf's TLSCertificateFile directive" /> + <echo level="info" message="tolvendev-ldap-key.pem specifies the file that contains the private key that matches the certificate, referenced by slap.conf's TLSCertificateKeyFile directive" /> + <echo level="info" message="tolvendev-ldap-cacerts.pem specifies the PEM-format file containing certificates for the CA's that slapd will trust, referenced by slap.conf's TLSCACertificateFile directive" /> </target> *************** *** 396,399 **** --- 390,398 ---- </fileset> </move> + <echo level="info" message="The DB certificates are located in ${tolven.stage}/postgres-deploy-location/data" /> + <echo level="info" message="server.crt specifies the file that contains the db server certificate" /> + <echo level="info" message="server.key specifies the file that contains the db private key" /> + <echo level="info" message="root.crt specifies the PEM-format file containing certificates for the CA's that postgresql will trust" /> + <echo level="info" message="IMPORTANT: NOTE THAT FOR POSTGRES THE PASSWORD HAS BEEN REMOVED FROM server.key" /> </target> *************** *** 406,409 **** --- 405,410 ---- </fileset> </move> + <echo level="info" message="The Postgresql client key and certificate are located in ${tolven.stage}/pg-client" /> + <echo level="info" message="Postgresql clients can use postgres.crt and postgres.key to communicate with Postgresql" /> </target> *************** *** 425,428 **** --- 426,435 ---- </fileset> </move> + <echo level="info" message="The JBoss ldapserver.password and pgserver.password have been placed in ${tolven.stage}/jboss-server/conf" /> + <echo level="info" message="The JBoss keystore and truststore are located in ${tolven.stage}/jboss-server/conf" /> + <echo level="info" message="tolvendev-jboss.jks specifies the Java Key Store-format file containing the certificate and key used for SSL between JBoss and Postgres/LDAP" /> + <echo level="info" message="tolvendev-jboss-cacerts.jks specifies the Java Key Store-format file containing certificates for the CA's that JBoss will trust" /> + <echo level="info" message="Forced to use a self-signed certificated for tolvendev-webserver.jks because some browsers will not support one signed otherwise, unless the signer is locally installed" /> + <echo level="info" message="tolvendev-webserver.jks specifies the Java Key Store-format file containing the certificate and key used for SSL between web clients and tomcat" /> </target> *************** *** 438,441 **** --- 445,449 ---- </fileset> </move> + <echo level="info" message="hashed-ldapserver.password and hashed-slapd.password have been placed in ${tolven.stage}/misc" /> </target> *************** *** 466,470 **** <os family="windows"/> </condition> ! <copy toDir="${postgres-client-cert-dir}" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/pg-client"> <include name="postgresql.crt"/> --- 474,478 ---- <os family="windows"/> </condition> ! <copy toDir="${postgres-client-cert-dir}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/pg-client"> <include name="postgresql.crt"/> *************** *** 475,479 **** <target name="deploy-jboss-credentials" description="Initialize JBoss for Tolven"> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/jboss-server/conf"> <include name="ldapserver.password"/> --- 483,487 ---- <target name="deploy-jboss-credentials" description="Initialize JBoss for Tolven"> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/conf"> <include name="ldapserver.password"/> *************** *** 487,491 **** <target name="deploy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="tolvendev-ldap-cert.pem"/> --- 495,499 ---- <target name="deploy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="tolvendev-ldap-cert.pem"/> *************** *** 512,516 **** <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> ! <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="server.crt"/> --- 520,524 ---- <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> ! <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="server.crt"/> |
|
From: Joseph I. <jos...@us...> - 2006-09-01 08:26:12
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13271/template Modified Files: ant-build.template Log Message: Added more echo comments Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ant-build.template 1 Sep 2006 04:54:55 -0000 1.39 --- ant-build.template 1 Sep 2006 08:26:09 -0000 1.40 *************** *** 44,47 **** --- 44,48 ---- tolven.stage=${tolven.location}/stage + message.show.copy="true" tolven.security.openssl.cert.CountryName=US |
|
From: Joseph I. <jos...@us...> - 2006-09-01 08:26:12
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13271 Modified Files: build.xml Log Message: Added more echo comments Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** build.xml 1 Sep 2006 05:12:59 -0000 1.46 --- build.xml 1 Sep 2006 08:26:09 -0000 1.47 *************** *** 4,12 **** <target name="createPropertiesFiles"> ! <copy file="template/ant-build.template" toFile="resources/ant-build.properties"/> ! <copy file="template/tolven.template" toFile="resources/tolven.properties"/> </target> <target name="stage-init-all"> <delete dir="${tolven.stage}" /> <ant target="stage-init" /> --- 4,13 ---- <target name="createPropertiesFiles"> ! <copy file="template/ant-build.template" toFile="resources/ant-build.properties" verbose="${message.show.copy}" /> ! <copy file="template/tolven.template" toFile="resources/tolven.properties" verbose="${message.show.copy}" /> </target> <target name="stage-init-all"> + <fail unless="tolven.stage" message="tolven.stage must be set in ant-build.properties" /> <delete dir="${tolven.stage}" /> <ant target="stage-init" /> *************** *** 16,21 **** <target name="stage-init"> <mkdir dir="${tolven.stage}/ldap-deploy-location" /> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" > <fileset dir="ldap-config/"> <include name="tolveninitial.ldif"/> --- 17,23 ---- <target name="stage-init"> + <fail unless="tolven.stage" message="tolven.stage must be set in ant-build.properties" /> <mkdir dir="${tolven.stage}/ldap-deploy-location" /> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" > <fileset dir="ldap-config/"> <include name="tolveninitial.ldif"/> *************** *** 23,27 **** </copy> <mkdir dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" /> ! <copy toDir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" > <fileset dir="jboss-config/"> <include name="postgresql-persistence-service.xml"/> --- 25,29 ---- </copy> <mkdir dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" /> ! <copy toDir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" > <fileset dir="jboss-config/"> <include name="postgresql-persistence-service.xml"/> *************** *** 31,35 **** </copy> <mkdir dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" /> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > <fileset dir="${facelets.location}/lib"> <include name="el-api.jar"/> --- 33,37 ---- </copy> <mkdir dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" /> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}" > <fileset dir="${facelets.location}/lib"> <include name="el-api.jar"/> *************** *** 41,45 **** </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/lib"> <fileset dir="${jdbc.location}"> <include name="*.jar"/> --- 43,47 ---- </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/lib" verbose="${message.show.copy}" > <fileset dir="${jdbc.location}"> <include name="*.jar"/> *************** *** 60,63 **** --- 62,66 ---- <target name="stage-init-merge-credentials"> + <fail unless="tolven.stage" message="tolven.stage must be set in ant-build.properties" /> <loadfile property="hashed-slapd-password" srcFile="${tolven.stage}/misc/hashed-slapd.password"/> <loadfile property="hashed-ldapserver.password" srcFile="${tolven.stage}/misc/hashed-ldapserver.password"/> *************** *** 73,92 **** <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="ldap-config/"> <include name="slapd.conf"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/conf" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> <include name="login-config.xml"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > <fileset dir="jboss-config/"> <include name="server.xml"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> <include name="tolven-properties-service.xml"/> --- 76,95 ---- <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="ldap-config/"> <include name="slapd.conf"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/conf" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> <include name="login-config.xml"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> <include name="server.xml"/> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="jboss-config/"> <include name="tolven-properties-service.xml"/> *************** *** 99,108 **** <target name="deploy-from-stage"> <mkdir dir="${ldap.location}/tolvendata"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="tolveninitial.ldif"/> </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar"> <include name="postgresql-persistence-service.xml"/> --- 102,111 ---- <target name="deploy-from-stage"> <mkdir dir="${ldap.location}/tolvendata"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="tolveninitial.ldif"/> </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar"> <include name="postgresql-persistence-service.xml"/> *************** *** 111,115 **** </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs"> <include name="el-api.jar"/> --- 114,118 ---- </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs"> <include name="el-api.jar"/> *************** *** 119,123 **** </fileset> </copy> ! <copy toDir="${deploy.location}/lib"> <fileset dir="${tolven.stage}/jboss-server/lib"> <include name="jaxb-api.jar"/> --- 122,126 ---- </fileset> </copy> ! <copy toDir="${deploy.location}/lib" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/lib"> <include name="jaxb-api.jar"/> *************** *** 128,132 **** </copy> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="tolvendev-ldap-cert.pem" /> --- 131,135 ---- </copy> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/ldap-deploy-location"> <include name="tolvendev-ldap-cert.pem" /> *************** *** 138,142 **** </copy> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="${tolven.stage}/jboss-server/conf"> <include name="ldapserver.password" /> --- 141,145 ---- </copy> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/conf"> <include name="ldapserver.password" /> *************** *** 148,152 **** </fileset> </copy> ! <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="${tolven.stage}/jboss-server/deploy"> <include name="tolven-ds.xml"/> --- 151,155 ---- </fileset> </copy> ! <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/deploy"> <include name="tolven-ds.xml"/> *************** *** 155,159 **** </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar"> <include name="server.xml"/> --- 158,162 ---- </fileset> </copy> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" verbose="${message.show.copy}"> <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar"> <include name="server.xml"/> *************** *** 170,173 **** --- 173,180 ---- </target> + <!-- For this target to work as a combo, to tolvendata directory should be empty, + or in other words, LDAP should not have been initialized. The database should also + not contain the tolven schemas ie. be uninitialized. The targets contained here + can be run independently--> <target name="init-external-dependencies"> <ant target="ldapInit" /> *************** *** 209,213 **** <target name="deploy" depends="packaging"> ! <copy toDir="${deploy.location}/deploy"> <fileset file="build/tolven.ear"/> </copy> --- 216,220 ---- <target name="deploy" depends="packaging"> ! <copy toDir="${deploy.location}/deploy" verbose="${message.show.copy}"> <fileset file="build/tolven.ear"/> </copy> |
|
From: Joseph I. <jos...@us...> - 2006-09-01 06:52:44
|
Update of /cvsroot/tolven/tolvenEJB In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5484 Modified Files: .cvsignore Log Message: To prevent certain files from being inadvertently committed to the repository. Index: .cvsignore =================================================================== RCS file: /cvsroot/tolven/tolvenEJB/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 1 Sep 2006 06:37:46 -0000 1.1 --- .cvsignore 1 Sep 2006 06:52:42 -0000 1.2 *************** *** 1 **** ! bin \ No newline at end of file --- 1,6 ---- ! .externalToolBuilders ! .settings ! bin ! .classpath ! .packaging ! .project \ No newline at end of file |
|
From: Joseph I. <jos...@us...> - 2006-09-01 06:52:41
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5477 Added Files: .cvsignore Log Message: To prevent certain files from being inadvertently committed to the repository. --- NEW FILE: .cvsignore --- .externalToolBuilders .settings bin .classpath .packaging .project stage |
|
From: Joseph I. <jos...@us...> - 2006-09-01 06:37:49
|
Update of /cvsroot/tolven/tolvenEJB In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31794 Added Files: .cvsignore Log Message: Ignore the bin directory as per tolvenWeb --- NEW FILE: .cvsignore --- bin |
|
From: Joseph I. <jos...@us...> - 2006-09-01 05:13:03
|
Update of /cvsroot/tolven/tolven/security-config In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28896/security-config Modified Files: build.xml Log Message: Creation of a tolven stage directory which contain a snapshot of all credentials, files etc which are created and deployed by tolven. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** build.xml 27 Aug 2006 04:32:36 -0000 1.29 --- build.xml 1 Sep 2006 05:12:59 -0000 1.30 *************** *** 12,16 **** <fail unless="tolven.security.openssl.command" /> <fail unless="tolven.security.openssl.config" /> ! <fail unless="tolven.security.credentials.dir" /> <fail unless="tolven.security.openssl.ca.dir" /> --- 12,16 ---- <fail unless="tolven.security.openssl.command" /> <fail unless="tolven.security.openssl.config" /> ! <fail unless="tolven.stage" /> <fail unless="tolven.security.openssl.ca.dir" /> *************** *** 77,80 **** --- 77,81 ---- <target name="all" depends="password-input"> + <delete dir="${tolven.security.build.dir}" /> <ant target="create-ca" /> <ant target="create-tolvendev-ldap-cert" /> *************** *** 85,101 **** <ant target="create-tolvendev-jboss-cacerts" /> <ant target="create-tolvendev-webserver-keystore" /> ! <ant target="save-security-certificates" /> ! <ant target="jbossInit" /> ! <ant target="ldapInit" /> ! <ant target="databaseInit" /> </target> - <target name="cert-init"> - <echo level="info" message="For this task to work correctly, ant property tolven.security.openssl.command must lead to the openssl command" /> - <echo level="info" message="The user must have access to the directory above openssl's certs directory, and the key to certs/private/cakey.pem" /> - </target> - <target name="create-ca" depends="password-input"> - <delete dir="${tolven.security.openssl.ca.dir}" /> <mkdir dir="${tolven.security.openssl.ca.dir}" /> <mkdir dir="${tolven.security.openssl.ca.dir}/certs" /> --- 86,96 ---- <ant target="create-tolvendev-jboss-cacerts" /> <ant target="create-tolvendev-webserver-keystore" /> ! <ant target="create-ldap-password-file" /> ! <ant target="create-pg-password-file" /> ! <ant target="save-security-credentials" /> ! <delete dir="${tolven.security.build.dir}" /> </target> <target name="create-ca" depends="password-input"> <mkdir dir="${tolven.security.openssl.ca.dir}" /> <mkdir dir="${tolven.security.openssl.ca.dir}/certs" /> *************** *** 116,120 **** <target name="create-tolvendev-ldap-cert" depends="password-input"> <echo level="info" message="Creating LDAP certificate" /> - <delete dir="${tolven.security.openssl.ldap.dir}" /> <mkdir dir="${tolven.security.openssl.ldap.dir}" /> <exec dir="${tolven.security.openssl.ldap.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> --- 111,114 ---- *************** *** 126,131 **** </exec> <move file="${tolven.security.openssl.ca.dir}/tolvendev-ldap-cert.pem" toDir="${tolven.security.openssl.ldap.dir}" /> - <delete file="${tolven.security.openssl.ca.dir}/tolvendev-ldap-req.pem" /> - <ant target="display-tolvendev-ldap-cert" /> <echo level="info" message="The LDAP certificate is located in ${tolven.security.openssl.ldap.dir}" /> <echo level="info" message="tolvendev-ldap-cert.pem specifies the file that contains the slapd server certificate, referenced by slap.conf's TLSCertificateFile directive" /> --- 120,123 ---- *************** *** 135,139 **** <target name="create-tolvendev-db-cert" depends="password-input"> <echo level="info" message="Creating DB certificate" /> - <delete dir="${tolven.security.openssl.db.dir}" /> <mkdir dir="${tolven.security.openssl.db.dir}" /> <exec dir="${tolven.security.openssl.db.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> --- 127,130 ---- *************** *** 145,154 **** </exec> <move file="${tolven.security.openssl.ca.dir}/server.crt" toDir="${tolven.security.openssl.db.dir}" /> - <delete file="${tolven.security.openssl.ca.dir}/tolvendev-db-req.pem" /> <exec dir="${tolven.security.openssl.db.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> <arg line="rsa -passin pass:${tolven.db.key} -in ${tolven.security.openssl.db.dir}/tolvendev-db-key.pem -out ${tolven.security.openssl.db.dir}/server.key" /> </exec> - <delete file="${tolven.security.openssl.db.dir}/tolvendev-db-key.pem" /> - <ant target="display-tolvendev-db-cert" /> <echo level="info" message="The DB certificate is located in ${tolven.security.openssl.db.dir}" /> <echo level="info" message="server.crt specifies the file that contains the db server certificate" /> --- 136,142 ---- *************** *** 160,164 **** <target name="create-tolvendev-jboss-keystore" depends="password-input"> <echo level="info" message="Creating JBoss certificate" /> - <delete dir="${tolven.security.openssl.jboss.dir}" /> <mkdir dir="${tolven.security.openssl.jboss.dir}" /> <exec dir="${tolven.security.openssl.jboss.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> --- 148,151 ---- *************** *** 180,184 **** </exec> <move file="${tolven.security.openssl.ca.dir}/certs/cacert.der" toDir="${tolven.security.openssl.jboss.dir}" /> - <delete file="${tolven.security.openssl.ca.dir}/tolvendev-jboss-req.der" /> <move file="${tolven.security.openssl.ca.dir}/tolvendev-jboss-cert.pem" toDir="${tolven.security.openssl.jboss.dir}" /> <exec dir="${tolven.security.openssl.jboss.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> --- 167,170 ---- *************** *** 188,194 **** <arg line="-import -noprompt -keystore tolvendev-jboss.jks -keypass ${tolven.jboss.keystore.jboss.key} -storepass ${tolven.jboss.keystore} -alias tolven-demo-jboss-host -file tolvendev-jboss-cert.der" /> </exec> - <delete file="${tolven.security.openssl.jboss.dir}/tolvendev-jboss-cert.der" /> - <delete file="${tolven.security.openssl.jboss.dir}/cacert.der" /> - <ant target="display-tolvendev-jboss-keystore" /> <echo level="info" message="The JBoss keystore is located in ${tolven.security.openssl.jboss.dir}" /> </target> --- 174,177 ---- *************** *** 199,203 **** <filelist dir="${tolven.security.openssl.jboss.dir}" files="tolvendev-jboss-cert.pem" /> </concat> - <ant target="display-tolvendev-ldap-cacerts" /> <echo level="info" message="The LDAP truststore is located in ${tolven.security.openssl.ldap.dir}" /> <echo level="info" message="tolvendev-ldap-cacerts.pem specifies the PEM-format file containing certificates for the CA's that slapd will trust, referenced by slap.conf's TLSCACertificateFile directive" /> --- 182,185 ---- *************** *** 217,221 **** </condition> <ant target="${db-client-target}" /> - <ant target="display-tolvendev-db-cacerts" /> <echo level="info" message="The db truststore is located in ${tolven.security.openssl.db.dir}" /> <echo level="info" message="root.crt specifies the PEM-format file containing certificates for the CA's that postgresql will trust" /> --- 199,202 ---- *************** *** 244,253 **** <arg line="-import -noprompt -keystore tolvendev-jboss-cacerts.jks -keypass ${tolven.jboss.truststore.db.key} -storepass ${tolven.jboss.truststore} -alias tolven-demo-db-host -file tolvendev-db-cert.der" /> </exec> - <delete> - <fileset dir="${tolven.security.openssl.jboss.dir}"> - <include name="**/*.der" /> - </fileset> - </delete> - <ant target="display-tolvendev-jboss-cacerts" /> <echo level="info" message="The JBoss truststore is located in ${tolven.security.openssl.jboss.dir}" /> <echo level="info" message="tolvendev-jboss-cacerts.jks specifies the Java Key Store-format file containing certificates for the CA's that JBoss will trust, and is placed in ${deploy.location}/conf" /> --- 225,228 ---- *************** *** 256,265 **** <target name="create-tolvendev-webserver-keystore" depends="password-input"> <echo level="info" message="Creating WebServer keystore" /> - <delete dir="${tolven.security.openssl.webserver.dir}" /> <mkdir dir="${tolven.security.openssl.webserver.dir}" /> <exec dir="${tolven.security.openssl.webserver.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-genkey -keystore tolvendev-webserver.jks -keypass ${tolven.webserver.key} -storepass ${tolven.webserver.keystore} -alias tolven-demo-webserver-host -validity 10000 -dname "cn=${tolven.security.openssl.cert.CountryName} s=${tolven.security.openssl.cert.StateOrProvince} o='${tolven.security.openssl.cert.OrganizationName}' ou=${tolven.security.openssl.cert.OrganizationUnitName} cn=${tolven.security.openssl.cert.webserver.CommonName}"" /> </exec> - <ant target="display-tolvendev-webserver-keystore" /> <echo level="info" message="The WebServer keystore is located in ${tolven.security.openssl.webserver.dir}" /> <echo level="info" message="Forced to use a self-signed certificated for this demo because some browsers will not support one signed otherwise, unless the signer is locally installed" /> --- 231,238 ---- *************** *** 277,281 **** <arg line="ca -batch -passin pass:${tolven.ca.key} -config ${tolven.security.openssl.config} -out tolvendev-client-cert.pem -days 10000 -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.pg.client.CommonName}/emailAddress=${tolven.security.openssl.cert.pg.client.Email} -infiles tolvendev-client-req.pem" /> </exec> - <delete file="${tolven.security.openssl.ca.dir}/tolvendev-client-req.pem" /> <move file="${tolven.security.openssl.ca.dir}/tolvendev-client-cert.pem" toFile="${tolven.security.openssl.db.dir}/postgresql.crt" /> <exec dir="${tolven.security.openssl.db.dir}" executable="${tolven.security.openssl.command}" failonerror="true"> --- 250,253 ---- *************** *** 285,297 **** <filelist dir="${tolven.security.openssl.db.dir}" files="postgresql.crt" /> </concat> - <copy file="${tolven.security.openssl.db.dir}/postgresql.key" toDir="${postgres-client-cert-dir}" /> - <copy file="${tolven.security.openssl.db.dir}/postgresql.crt" toDir="${postgres-client-cert-dir}" /> - <echo level="info" message="The Client certificate postgresql.crt and its key postgresql.key are located in ${tolven.security.openssl.db.dir}" /> - <echo level="info" message="postgresql.crt has been placed in root.crt" /> </target> <target name="display-tolvendev-ldap-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.security.openssl.ldap.dir}/tolvendev-ldap-cert.pem" /> </exec> </target> --- 257,318 ---- <filelist dir="${tolven.security.openssl.db.dir}" files="postgresql.crt" /> </concat> </target> + <target name="create-ldap-password-file"> + <fail unless="tolven.security.ldap.salt" /> + <fail unless="tolven.security.ldap.iterations" /> + <fail unless="tolven.security.openssl.ldap.dir" /> + <input message="LDAP: Please enter the LDAP password to be hashed" addproperty="tolven.ldap.password" /> + <input message="LDAP: Please enter a keystore password to protect the LDAP password" addproperty="tolven.ldap.keystore.password" /> + <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> + <arg value="${tolven.security.ldap.salt}" /> + <arg value="${tolven.security.ldap.iterations}" /> + <arg value="${tolven.ldap.keystore.password}" /> + <arg value="${tolven.security.openssl.ldap.dir}/ldapserver.password" /> + </java> + <fail unless="tolven.security.ldap.salt" /> + <fail unless="tolven.security.ldap.iterations" /> + <input message="Please enter the ldap password to be hashed" addproperty="tolven.ldap.password" /> + <input message="Please enter a keystore password to protect the ldap password" addproperty="tolven.ldap.keystore.password" /> + <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.ldap.dir}/hashed-ldapserver.password" failonerror="true"> + <arg value="${tolven.security.ldap.salt}" /> + <arg value="${tolven.security.ldap.iterations}" /> + <arg value="${tolven.ldap.keystore.password}" /> + <arg value="${tolven.ldap.password}" /> + </java> + <replace file="${tolven.security.openssl.ldap.dir}/hashed-ldapserver.password" token="Encoded password: " value=""/> + <exec executable="${tolven.security.slappasswd.command}" output="${tolven.security.openssl.ldap.dir}/hashed-slapd.password"> + <arg line="-s ${tolven.ldap.password}"/> + </exec> + </target> + + <target name="create-pg-password-file"> + <fail unless="tolven.security.db.salt" /> + <fail unless="tolven.security.db.iterations" /> + <fail unless="tolven.security.openssl.db.dir" /> + <input message="Postgres: Please enter the postgres password to be hashed" addproperty="tolven.database.password" /> + <input message="Postgres: Please enter a keystore password to protect the postgres password" addproperty="tolven.database.keystore.password" /> + <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> + <arg value="${tolven.security.db.salt}" /> + <arg value="${tolven.security.db.iterations}" /> + <arg value="${tolven.database.keystore.password}" /> + <arg value="${tolven.security.openssl.db.dir}/pgserver.password" /> + </java> + <fail unless="tolven.security.db.salt" /> + <fail unless="tolven.security.db.iterations" /> + <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> + <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> + <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.db.dir}/hashed-pgserver.password" failonerror="true"> + <arg value="${tolven.security.db.salt}" /> + <arg value="${tolven.security.db.iterations}" /> + <arg value="${tolven.database.keystore.password}" /> + <arg value="${tolven.database.password}" /> + </java> + <replace file="${tolven.security.openssl.db.dir}/hashed-pgserver.password" token="Encoded password: " value=""/> + </target> + <target name="display-tolvendev-ldap-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.stage}/ldap-deploy-location/tolvendev-ldap-cert.pem" /> </exec> </target> *************** *** 299,303 **** <target name="display-tolvendev-ldap-cacerts"> <concat> ! <filelist dir="${tolven.security.openssl.ldap.dir}" files="tolvendev-ldap-cacerts.pem" /> </concat> </target> --- 320,324 ---- <target name="display-tolvendev-ldap-cacerts"> <concat> ! <filelist dir="${tolven.stage}/ldap-deploy-location" files="tolvendev-ldap-cacerts.pem" /> </concat> </target> *************** *** 305,309 **** <target name="display-tolvendev-db-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.security.openssl.db.dir}/server.crt" /> </exec> </target> --- 326,330 ---- <target name="display-tolvendev-db-cert"> <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="x509 -text -in ${tolven.stage}/postgres-deploy-location/data/server.crt" /> </exec> </target> *************** *** 311,326 **** <target name="display-tolvendev-db-cacerts"> <concat> ! <filelist dir="${tolven.security.openssl.db.dir}" files="root.crt" /> </concat> </target> - <target name="display-tolvendev-jboss-cert"> - <exec executable="${tolven.security.openssl.command}" failonerror="true"> - <arg line="x509 -text -in ${tolven.security.openssl.jboss.dir}/tolvendev-jboss-cert.pem" /> - </exec> - </target> - <target name="display-tolvendev-jboss-keystore"> ! <exec dir="${tolven.security.openssl.jboss.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-jboss.jks -storepass ${tolven.jboss.keystore}" /> </exec> --- 332,342 ---- <target name="display-tolvendev-db-cacerts"> <concat> ! <filelist dir="${tolven.stage}/postgres-deploy-location/data" files="root.crt" /> </concat> </target> <target name="display-tolvendev-jboss-keystore"> ! <input message="Please enter password for JBoss key store" addproperty="tolven.jboss.keystore" /> ! <exec dir="${tolven.stage}/jboss-server/conf" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-jboss.jks -storepass ${tolven.jboss.keystore}" /> </exec> *************** *** 328,332 **** <target name="display-tolvendev-jboss-cacerts"> ! <exec dir="${tolven.security.openssl.jboss.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-jboss-cacerts.jks -storepass ${tolven.jboss.truststore}" /> </exec> --- 344,349 ---- <target name="display-tolvendev-jboss-cacerts"> ! <input message="Please enter password for JBoss trust store" addproperty="tolven.jboss.truststore" /> ! <exec dir="${tolven.stage}/jboss-server/conf" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-jboss-cacerts.jks -storepass ${tolven.jboss.truststore}" /> </exec> *************** *** 334,399 **** <target name="display-tolvendev-webserver-keystore"> ! <exec dir="${tolven.security.openssl.webserver.dir}" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-webserver.jks -storepass ${tolven.webserver.keystore}" /> </exec> </target> ! <target name="save-security-certificates" description="Initialize Postgres for Tolven" depends="required-properties"> ! <delete dir="${tolven.security.credentials.dir}" /> ! <mkdir dir="${tolven.security.credentials.dir}" /> ! <move toDir="${tolven.security.credentials.dir}" file="${tolven.security.openssl.ca.dir}" /> ! <move toDir="${tolven.security.credentials.dir}" file="${tolven.security.openssl.db.dir}" /> ! <move toDir="${tolven.security.credentials.dir}" file="${tolven.security.openssl.jboss.dir}" /> ! <move toDir="${tolven.security.credentials.dir}" file="${tolven.security.openssl.ldap.dir}" /> ! <move toDir="${tolven.security.credentials.dir}" file="${tolven.security.openssl.webserver.dir}" /> ! <echo level="info" message="Please read the installation output above to discover where individual credentials have been copied for application use." /> ! <echo level="info" message="All credentials have also been moved from ${tolven.security.build.dir} to ${tolven.security.credentials.dir} for safe keeping BUT will be DELETED if all certificates are generated again." /> </target> ! <target name="jbossInit" description="Initialize JBoss for Tolven" depends="required-properties"> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.security.credentials.dir}/jboss"> ! <include name="tolvendev-jboss.jks"/> ! <include name="tolvendev-jboss-cacerts.jks"/> </fileset> ! <fileset dir="${tolven.security.credentials.dir}/webserver"> ! <include name="tolvendev-webserver.jks"/> </fileset> ! </copy> </target> ! ! <target name="ldapInit" description="Initialize LDAP for Tolven" depends="required-properties"> ! <condition property="ldap-copy-target" value="copy-certs-to-localhost-ldap" else="copy-certs-to-remote-ldap"> <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${ldap-copy-target}" /> </target> ! ! <target name="databaseInit" description="Initialize Postgres for Tolven" depends="required-properties"> ! <condition property="pg-copy-target" value="copy-certs-to-localhost-pg" else="copy-certs-to-remote-pg"> <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${pg-copy-target}" /> </target> ! <target name="get-cert-from-ldap"> ! <echo level="info" message="Test LDAP after a LDAP server is started with a copy of the created certificates...all certificates must be in their original creation directories." /> ! <input message="Please enter password for LDAP private key" addproperty="tolven.ldap.key" /> ! <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="s_client -verify 10 -pass pass:${tolven.ldap.key} -connect ${tolven.security.openssl.ldap.host-port} -cert ${tolven.security.credentials.dir}/ca/certs/cacert.pem -key ${tolven.security.credentials.dir}/ca/keys/private/cakey.pem -prexit" /> ! </exec> </target> ! <target name="get-cert-from-db"> ! <echo level="info" message="Test DB after a DB server is started with a copy of the created certificates...all certificates must be in their original creation directories." /> ! <input message="Please enter password for DB private key" addproperty="tolven.db.key" /> ! <exec executable="${tolven.security.openssl.command}" failonerror="true"> ! <arg line="s_client -verify 10 -pass pass:${tolven.db.key} -connect ${tolven.security.openssl.db.host-port} -cert ${tolven.security.credentials.dir}/ca/certs/cacert.pem -key ${tolven.security.credentials.dir}/ca/keys/private/cakey.pem -prexit" /> ! </exec> </target> ! <target name="copy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.security.credentials.dir}/ldap"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> --- 351,492 ---- <target name="display-tolvendev-webserver-keystore"> ! <input message="Please enter password for WebServer keystore" addproperty="tolven.webserver.keystore" /> ! <exec dir="${tolven.stage}/jboss-server/conf" executable="${tolven.security.keytool.command}" failonerror="true"> <arg line="-list -rfc -keystore tolvendev-webserver.jks -storepass ${tolven.webserver.keystore}" /> </exec> </target> ! <target name="save-security-credentials" description="Initialize Postgres for Tolven" depends="required-properties"> ! <fail unless="tolven.stage" /> ! <mkdir dir="${tolven.stage}" /> ! <move toDir="${tolven.stage}" file="${tolven.security.openssl.ca.dir}" /> ! <ant target="update-tolven-stage-ldap" /> ! <ant target="update-tolven-stage-pg" /> ! <ant target="update-tolven-stage-pg-client" /> ! <ant target="update-tolven-stage-jboss" /> ! <ant target="update-tolven-stage-misc" /> ! <ant target="display-tolvendev-ldap-cert" /> ! <ant target="display-tolvendev-db-cert" /> ! <ant target="display-tolvendev-db-cacerts" /> ! <ant target="display-tolvendev-jboss-keystore" /> ! <ant target="display-tolvendev-ldap-cacerts" /> ! <ant target="display-tolvendev-jboss-cacerts" /> ! <ant target="display-tolvendev-webserver-keystore" /> ! <echo level="info" message="All credentials have also been moved from ${tolven.stage}." /> </target> ! <target name="update-tolven-stage-ldap" description="Initialize Postgres for Tolven"> ! <mkdir dir="${tolven.stage}/ldap-deploy-location" /> ! <move toDir="${tolven.stage}/ldap-deploy-location"> ! <fileset dir="${tolven.security.openssl.ldap.dir}"> ! <include name="tolvendev-ldap-cert.pem" /> ! <include name="tolvendev-ldap-key.pem" /> ! <include name="tolvendev-ldap-cacerts.pem" /> </fileset> ! </move> ! </target> ! ! <target name="update-tolven-stage-pg" description="Initialize Postgres for Tolven"> ! <mkdir dir="${tolven.stage}/postgres-deploy-location/data" /> ! <move toDir="${tolven.stage}/postgres-deploy-location/data"> ! <fileset dir="${tolven.security.openssl.db.dir}"> ! <include name="server.crt" /> ! <include name="server.key" /> ! <include name="root.crt" /> </fileset> ! </move> </target> ! ! <target name="update-tolven-stage-pg-client" description="Initialize Postgres for Tolven"> ! <mkdir dir="${tolven.stage}/pg-client" /> ! <move toDir="${tolven.stage}/pg-client"> ! <fileset dir="${tolven.security.openssl.db.dir}"> ! <include name="postgresql.crt" /> ! <include name="postgresql.key" /> ! </fileset> ! </move> ! </target> ! ! <target name="update-tolven-stage-jboss" description="Initialize Postgres for Tolven"> ! <mkdir dir="${tolven.stage}/jboss-server/conf" /> ! <move toDir="${tolven.stage}/jboss-server/conf"> ! <fileset dir="${tolven.security.openssl.ldap.dir}"> ! <include name="ldapserver.password" /> ! </fileset> ! <fileset dir="${tolven.security.openssl.db.dir}"> ! <include name="pgserver.password" /> ! </fileset> ! <fileset dir="${tolven.security.openssl.jboss.dir}"> ! <include name="tolvendev-jboss.jks" /> ! <include name="tolvendev-jboss-cacerts.jks" /> ! </fileset> ! <fileset dir="${tolven.security.openssl.webserver.dir}"> ! <include name="tolvendev-webserver.jks" /> ! </fileset> ! </move> ! </target> ! ! <target name="update-tolven-stage-misc" description="Initialize Postgres for Tolven"> ! <mkdir dir="${tolven.stage}/misc" /> ! <move toDir="${tolven.stage}/misc"> ! <fileset dir="${tolven.security.openssl.ldap.dir}"> ! <include name="hashed-ldapserver.password" /> ! <include name="hashed-slapd.password" /> ! </fileset> ! <fileset dir="${tolven.security.openssl.db.dir}"> ! <include name="hashed-pgserver.password" /> ! </fileset> ! </move> ! </target> ! ! <target name="deploy-credentials" description="Initialize LDAP for Tolven"> ! <ant target="deploy-ldap-credentials" /> ! <ant target="deploy-db-credentials" /> ! <ant target="deploy-pg-client-credentials" /> ! <ant target="deploy-jboss-credentials" /> ! </target> ! ! <target name="deploy-ldap-credentials" description="Initialize LDAP for Tolven"> ! <condition property="deploy-ldap-target" value="deploy-certs-to-localhost-ldap" else="deploy-certs-to-remote-ldap"> <equals arg1="${ldap.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${deploy-ldap-target}" /> </target> ! ! <target name="deploy-db-credentials" description="Initialize Postgres for Tolven"> ! <condition property="deploy-pg-target" value="deploy-certs-to-localhost-pg" else="deploy-certs-to-remote-pg"> <equals arg1="${jdbc.host}" arg2="localhost" casesensitive="false" /> </condition> ! <ant target="${deploy-pg-target}" /> </target> ! <target name="deploy-pg-client-credentials" description="Initialize Postgres for Tolven"> ! <property environment="env" /> ! <condition property="postgres-client-cert-dir" value="${env.APPDATA}/postgresql" else="${user.home}/postgresql"> ! <os family="windows"/> ! </condition> ! <copy toDir="${postgres-client-cert-dir}" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.stage}/pg-client"> ! <include name="postgresql.crt"/> ! <include name="postgresql.key"/> ! </fileset> ! </copy> </target> ! <target name="deploy-jboss-credentials" description="Initialize JBoss for Tolven"> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.stage}/jboss-server/conf"> ! <include name="ldapserver.password"/> ! <include name="pgserver.password"/> ! <include name="tolvendev-jboss.jks"/> ! <include name="tolvendev-jboss-cacerts.jks"/> ! <include name="tolvendev-webserver.jks"/> ! </fileset> ! </copy> </target> ! <target name="deploy-certs-to-localhost-ldap" description="Copy certificates to localhost LDAP for Tolven"> <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> *************** *** 403,407 **** </target> ! <target name="copy-certs-to-remote-ldap" description="Copy certificates to remote LDAP for Tolven"> <fail unless="ldap.host" /> <fail unless="ldap.location" /> --- 496,500 ---- </target> ! <target name="deploy-certs-to-remote-ldap" description="Copy certificates to remote LDAP for Tolven"> <fail unless="ldap.host" /> <fail unless="ldap.location" /> *************** *** 409,413 **** <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.security.credentials.dir}/ldap"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> --- 502,506 ---- <input message="To copy certificates, please enter user password for remote LDAP host: ${ldap.host}" addproperty="tolven.ldap.host.password" /> <scp todir="${ldap.host.user}@${ldap.host}:${ldap.location}" password="${tolven.ldap.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="tolvendev-ldap-cert.pem"/> <include name="tolvendev-ldap-key.pem"/> *************** *** 418,424 **** </target> ! <target name="copy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.security.credentials.dir}/db"> <include name="server.crt"/> <include name="server.key"/> --- 511,517 ---- </target> ! <target name="deploy-certs-to-localhost-pg" description="Copy certificates to localhost Postgres for Tolven"> <copy toDir="${postgres.location}/data" overwrite="true" preservelastmodified="true" > ! <fileset dir="${tolven.stage}/postgres-deploy-location}/data"> <include name="server.crt"/> <include name="server.key"/> *************** *** 428,432 **** </target> ! <target name="copy-certs-to-remote-pg" description="Copy certificates to remote Postgres for Tolven" depends="required-properties"> <fail unless="jdbc.host" /> <fail unless="postgres.location" /> --- 521,525 ---- </target> ! <target name="deploy-certs-to-remote-pg" description="Copy certificates to remote Postgres for Tolven"> <fail unless="jdbc.host" /> <fail unless="postgres.location" /> *************** *** 434,438 **** <input message="To copy over certificates, please enter user password for remote Posgres host: ${jdbc.host}" addproperty="tolven.pg.host.password" /> <scp todir="${postgres.host.user}@${jdbc.host}:${postgres.location}/data" password="${tolven.pg.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.security.credentials.dir}/db"> <include name="server.crt"/> <include name="server.key"/> --- 527,531 ---- <input message="To copy over certificates, please enter user password for remote Posgres host: ${jdbc.host}" addproperty="tolven.pg.host.password" /> <scp todir="${postgres.host.user}@${jdbc.host}:${postgres.location}/data" password="${tolven.pg.host.password}" trust="true" failonerror="true"> ! <fileset dir="${tolven.stage}/postgres-deploy-location/data"> <include name="server.crt"/> <include name="server.key"/> *************** *** 443,445 **** --- 536,554 ---- </target> + <target name="get-cert-from-ldap"> + <echo level="info" message="Test LDAP after a LDAP server is started with a copy of the created certificates...all certificates must be in their original creation directories." /> + <input message="Please enter password for LDAP private key" addproperty="tolven.ldap.key" /> + <exec executable="${tolven.security.openssl.command}" failonerror="true"> + <arg line="s_client -verify 10 -pass pass:${tolven.ldap.key} -connect ${tolven.security.openssl.ldap.host-port} -cert ${tolven.stage}/ca/certs/cacert.pem -key ${tolven.stage}/ca/keys/private/cakey.pem -prexit" /> + </exec> + </target> + + <target name="get-cert-from-db"> + <echo level="info" message="Test DB after a DB server is started with a copy of the created certificates...all certificates must be in their original creation directories." /> + <input message="Please enter password for DB private key" addproperty="tolven.db.key" /> + <exec executable="${tolven.security.openssl.command}" failonerror="true"> + <arg line="s_client -verify 10 -pass pass:${tolven.db.key} -connect ${tolven.security.openssl.db.host-port} -cert ${tolven.stage}/ca/certs/cacert.pem -key ${tolven.stage}/ca/keys/private/cakey.pem -prexit" /> + </exec> + </target> + </project> |
|
From: Joseph I. <jos...@us...> - 2006-09-01 05:13:03
|
Update of /cvsroot/tolven/tolven In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28896 Modified Files: build.xml Log Message: Creation of a tolven stage directory which contain a snapshot of all credentials, files etc which are created and deployed by tolven. Index: build.xml =================================================================== RCS file: /cvsroot/tolven/tolven/build.xml,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** build.xml 24 Aug 2006 14:40:30 -0000 1.45 --- build.xml 1 Sep 2006 05:12:59 -0000 1.46 *************** *** 2,79 **** <project basedir="." default="packaging" name="tolven"> <property file="resources/ant-build.properties"/> ! <filter token="deploy.location.conf" value="${deploy.location}/conf"/> ! <filter token="ldap.java.naming.provider.url" value="${ldap.java.naming.provider.url}"/> ! <filter token="tolven-jdbc-url" value="${jdbc.url}"/> <target name="createPropertiesFiles"> <copy file="template/ant-build.template" toFile="resources/ant-build.properties"/> <copy file="template/tolven.template" toFile="resources/tolven.properties"/> </target> ! <target name="init" depends="clean"> ! <mkdir dir="build"/> ! <mkdir dir="work"/> ! <mkdir dir="libs"/> ! <ant antfile="${tolvenEJB.location}/build.xml" target="init" inheritAll="false"/> ! <ant antfile="${tolvenWEB.location}/build.xml" target="init" inheritAll="false"/> ! </target> ! <target name="clean"> ! <delete dir="build"/> ! <delete dir="work"/> ! <delete dir="libs"/> ! <ant antfile="${tolvenEJB.location}/build.xml" target="clean" inheritAll="false"/> ! <ant antfile="${tolvenWEB.location}/build.xml" target="clean" inheritAll="false"/> ! </target> ! <target name="databaseInit"> ! <input message="Please enter db-password:" ! addproperty="tolven.database.password"/> ! <sql src="postgres-config/tolven-database-init.sql" ! driver="${jdbc.driver}" ! password="${tolven.database.password}" ! url="${jdbc.url.nonssl}" ! userid="${jdbc.username}"/> </target> ! <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> ! <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> ! <fail unless="tolven.security.ldap.salt" /> ! <fail unless="tolven.security.ldap.iterations" /> ! <fail unless="tolven.security.openssl.ldap.dir" /> ! <input message="Please enter the LDAP password to be hashed" addproperty="tolven.ldap.password" /> ! <input message="Please enter a keystore password to protect the LDAP password" addproperty="tolven.ldap.keystore.password" /> ! <delete file="${tolven.security.openssl.ldap.dir}/ldapserver.password" /> ! <mkdir dir="${tolven.security.openssl.ldap.dir}"/> ! <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> ! <arg value="${tolven.security.ldap.salt}" /> ! <arg value="${tolven.security.ldap.iterations}" /> ! <arg value="${tolven.ldap.keystore.password}" /> ! <arg value="${tolven.security.openssl.ldap.dir}/ldapserver.password" /> ! </java> ! <copy file="${tolven.security.openssl.ldap.dir}/ldapserver.password" toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" /> ! <move file="${tolven.security.openssl.ldap.dir}/ldapserver.password" toDir="${tolven.security.credentials.dir}/ldap" overwrite="true" /> ! <echo message="ldapserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> ! <echo message="A copy of ldapserver.password is located in ${tolven.security.credentials.dir}/ldap" /> ! <mkdir dir="${ldap.location}/tolvendata"/> ! <exec executable="${tolven.security.slappasswd.command}" outputproperty="hashed-slapd-ldapserver.password"> ! <arg line="-s ${tolven.ldap.password}"/> ! </exec> ! <filter token="slapd-conf-rootpw" value="${hashed-slapd-ldapserver.password}"/> ! <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="ldap-config/"> - <include name="slapd.conf"/> <include name="tolveninitial.ldif"/> </fileset> </copy> ! <exec dir="${ldap.location}" executable="${ldap.location}/slapadd.exe" > ! <arg line="-v -l tolveninitial.ldif -f slapd.conf"/> ! </exec> ! <echo level="info" message="You can start the LDAP server (SLAPD) now"/> ! </target> ! <target name="jbossInit" description="Initialize JBoss for Tolven"> ! <echo level="info" message="For this task to work correctly, JBoss must not be running and JBoss Messaging should already be installed"/> ! <delete> ! <fileset dir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs"> ! <include name="myfaces-api.jar"/> ! <include name="myfaces-impl.jar"/> ! </fileset> ! </delete> ! <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" > <fileset dir="jboss-config/"> <include name="postgresql-persistence-service.xml"/> --- 2,27 ---- <project basedir="." default="packaging" name="tolven"> <property file="resources/ant-build.properties"/> ! <target name="createPropertiesFiles"> <copy file="template/ant-build.template" toFile="resources/ant-build.properties"/> <copy file="template/tolven.template" toFile="resources/tolven.properties"/> </target> ! ! <target name="stage-init-all"> ! <delete dir="${tolven.stage}" /> ! <ant target="stage-init" /> ! <ant target="stage-init-generate-credentials" /> ! <ant target="stage-init-merge-credentials" /> </target> ! ! <target name="stage-init"> ! <mkdir dir="${tolven.stage}/ldap-deploy-location" /> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" > <fileset dir="ldap-config/"> <include name="tolveninitial.ldif"/> </fileset> </copy> ! <mkdir dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" /> ! <copy toDir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" > <fileset dir="jboss-config/"> <include name="postgresql-persistence-service.xml"/> *************** *** 82,131 **** </fileset> </copy> ! <delete file="${deploy.location}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml"/> ! <fail unless="tolven.security.db.salt" /> ! <fail unless="tolven.security.db.iterations" /> ! <fail unless="tolven.security.openssl.db.dir" /> ! <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> ! <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> ! <delete file="${tolven.security.openssl.db.dir}/pgserver.password" /> ! <mkdir dir="${tolven.security.openssl.db.dir}"/> ! <java classname="org.jboss.security.plugins.FilePassword" classpath="${deploy.location}/lib/jbosssx.jar" failonerror="true"> ! <arg value="${tolven.security.db.salt}" /> ! <arg value="${tolven.security.db.iterations}" /> ! <arg value="${tolven.database.keystore.password}" /> ! <arg value="${tolven.security.openssl.db.dir}/pgserver.password" /> ! </java> ! <copy file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" /> ! <move file="${tolven.security.openssl.db.dir}/pgserver.password" toDir="${tolven.security.credentials.dir}/db" overwrite="true" /> ! <echo message="pgserver.password located in ${deploy.location}/conf was created using org.jboss.security.plugins.FilePassword" /> ! <echo message="A copy of pgserver.password is located in ${tolven.security.credentials.dir}/db" /> ! ! <filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/> ! <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> ! <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> ! <fileset dir="jboss-config/"> ! <include name="login-config.xml"/> ! </fileset> ! </copy> ! <echo message="The hashed ldap password in login-config.xml was created using org.jboss.security.plugins.PBEUtils" /> ! <echo message="The hashed db password in login-config.xml was created using org.jboss.security.plugins.PBEUtils" /> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > ! <fileset dir="jboss-config/"> ! <include name="server.xml"/> ! </fileset> ! </copy> ! <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > <fileset dir="${facelets.location}/lib"> <include name="el-api.jar"/> <include name="el-ri.jar"/> </fileset> - </copy> - <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > <fileset dir="${jsf.location}/lib"> ! <include name="jsf-api.jar"/> ! <include name="jsf-impl.jar"/> </fileset> </copy> ! <copy toDir="${deploy.location}/lib"> <fileset dir="${jdbc.location}"> <include name="*.jar"/> --- 30,45 ---- </fileset> </copy> ! <mkdir dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" /> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > <fileset dir="${facelets.location}/lib"> <include name="el-api.jar"/> <include name="el-ri.jar"/> </fileset> <fileset dir="${jsf.location}/lib"> ! <include name="jsf-api.jar" /> ! <include name="jsf-impl.jar" /> </fileset> </copy> ! <copy toDir="${tolven.stage}/jboss-server/lib"> <fileset dir="${jdbc.location}"> <include name="*.jar"/> *************** *** 134,139 **** <include name="properties-plugin.jar"/> </fileset> - </copy> - <copy toDir="${deploy.location}/lib" overwrite="true" preservelastmodified="true"> <fileset dir="${jaxb.location}/lib" > <include name="jaxb-impl.jar"/> --- 48,51 ---- *************** *** 141,149 **** </fileset> </copy> <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> ! <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> <include name="tolven-properties-service.xml"/> --- 53,92 ---- </fileset> </copy> + </target> + + <target name="stage-init-generate-credentials"> + <ant antfile="${tolven.location}/security-config/build.xml" target="all" inheritAll="false"/> + </target> + + <target name="stage-init-merge-credentials"> + <loadfile property="hashed-slapd-password" srcFile="${tolven.stage}/misc/hashed-slapd.password"/> + <loadfile property="hashed-ldapserver.password" srcFile="${tolven.stage}/misc/hashed-ldapserver.password"/> + <loadfile property="hashed-pgserver.password" srcFile="${tolven.stage}/misc/hashed-pgserver.password"/> + <filter token="slapd-conf-rootpw" value="${hashed-slapd-password}"/> + <filter token="deploy.location.conf" value="${deploy.location}/conf"/> + <filter token="ldap.java.naming.provider.url" value="${ldap.java.naming.provider.url}"/> + <filter token="tolven-jdbc-url" value="${jdbc.url}"/> + <filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/> + <filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/> <filter token="tolven-ds-salt" value="${tolven.security.db.salt}"/> <filter token="tolven-ds-iterations" value="${tolven.security.db.iterations}"/> <filter token="tolven-ldap-salt" value="${tolven.security.ldap.salt}"/> <filter token="tolven-ldap-iterations" value="${tolven.security.ldap.iterations}"/> ! <copy toDir="${tolven.stage}/ldap-deploy-location" overwrite="true" preservelastmodified="true" filtering="true"> ! <fileset dir="ldap-config/"> ! <include name="slapd.conf"/> ! </fileset> ! </copy> ! <copy toDir="${tolven.stage}/jboss-server/conf" overwrite="true" preservelastmodified="true" filtering="true"> ! <fileset dir="jboss-config/"> ! <include name="login-config.xml"/> ! </fileset> ! </copy> ! <copy toDir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > ! <fileset dir="jboss-config/"> ! <include name="server.xml"/> ! </fileset> ! </copy> ! <copy toDir="${tolven.stage}/jboss-server/deploy" overwrite="true" preservelastmodified="true" filtering="true"> <fileset dir="jboss-config/"> <include name="tolven-properties-service.xml"/> *************** *** 152,156 **** --- 95,211 ---- </fileset> </copy> + </target> + + <target name="deploy-from-stage"> + <mkdir dir="${ldap.location}/tolvendata"/> + <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.stage}/ldap-deploy-location"> + <include name="tolveninitial.ldif"/> + </fileset> + </copy> + <copy toDir="${deploy.location}/deploy/jboss-messaging.sar" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.stage}/jboss-server/deploy/jboss-messaging.sar"> + <include name="postgresql-persistence-service.xml"/> + <include name="invitation-queue-service.xml"/> + <include name="rule-queue-service.xml"/> + </fileset> + </copy> + <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar/jsf-libs"> + <include name="el-api.jar"/> + <include name="el-ri.jar"/> + <include name="jsf-api.jar" /> + <include name="jsf-impl.jar" /> + </fileset> + </copy> + <copy toDir="${deploy.location}/lib"> + <fileset dir="${tolven.stage}/jboss-server/lib"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="postgresql-jdbc3-8.1-404.jar"/> + <include name="properties-plugin.jar"/> + </fileset> + </copy> + + <copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true"> + <fileset dir="${tolven.stage}/ldap-deploy-location"> + <include name="tolvendev-ldap-cert.pem" /> + <include name="tolvendev-ldap-key.pem" /> + <include name="tolvendev-ldap-cacerts.pem" /> + <include name="slapd.conf"/> + <include name="tolveninitial.ldif"/> + </fileset> + </copy> + + <copy toDir="${deploy.location}/conf" overwrite="true" preservelastmodified="true" filtering="true"> + <fileset dir="${tolven.stage}/jboss-server/conf"> + <include name="ldapserver.password" /> + <include name="login-config.xml"/> + <include name="pgserver.password" /> + <include name="tolvendev-jboss.jks" /> + <include name="tolvendev-jboss-cacerts.jks" /> + <include name="tolvendev-webserver.jks" /> + </fileset> + </copy> + <copy toDir="${deploy.location}/deploy" overwrite="true" preservelastmodified="true" filtering="true"> + <fileset dir="${tolven.stage}/jboss-server/deploy"> + <include name="tolven-ds.xml"/> + <include name="tolven-ldap-service.xml"/> + <include name="tolven-properties-service.xml"/> + </fileset> + </copy> + <copy toDir="${deploy.location}/deploy/jbossweb-tomcat55.sar" overwrite="true" preservelastmodified="true" > + <fileset dir="${tolven.stage}/jboss-server/jbossweb-tomcat55.sar"> + <include name="server.xml"/> + </fileset> + </copy> + <ant antfile="${tolven.location}/security-config/build.xml" target="deploy-credentials" inheritAll="false"/> + <delete> + <fileset dir="${deploy.location}/deploy/jbossweb-tomcat55.sar/jsf-libs"> + <include name="myfaces-api.jar"/> + <include name="myfaces-impl.jar"/> + </fileset> + </delete> + <delete file="${deploy.location}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml"/> + </target> + + <target name="init-external-dependencies"> + <ant target="ldapInit" /> + <ant target="databaseInit" /> + </target> + + <target name="ldapInit" description="Initialize a Tolven-specific LDAP server"> + <echo level="info" message="For this task to work correctly, SLAPD must not be running"/> + <exec dir="${ldap.location}" executable="${ldap.location}/slapadd.exe" > + <arg line="-v -l tolveninitial.ldif -f slapd.conf"/> + </exec> + <echo level="info" message="You can start the LDAP server (SLAPD) now"/> </target> + + <target name="databaseInit"> + <input message="Please enter db-password:" + addproperty="tolven.database.password"/> + <sql src="postgres-config/tolven-database-init.sql" + driver="${jdbc.driver}" + password="${tolven.database.password}" + url="${jdbc.url.nonssl}" + userid="${jdbc.username}"/> + </target> + + <target name="init" depends="clean"> + <mkdir dir="build"/> + <mkdir dir="work"/> + <mkdir dir="libs"/> + <ant antfile="${tolvenEJB.location}/build.xml" target="init" inheritAll="false"/> + <ant antfile="${tolvenWEB.location}/build.xml" target="init" inheritAll="false"/> + </target> + <target name="clean"> + <delete dir="build"/> + <delete dir="work"/> + <delete dir="libs"/> + <ant antfile="${tolvenEJB.location}/build.xml" target="clean" inheritAll="false"/> + <ant antfile="${tolvenWEB.location}/build.xml" target="clean" inheritAll="false"/> + </target> + <target name="deploy" depends="packaging"> <copy toDir="${deploy.location}/deploy"> *************** *** 242,286 **** </target> - <target name="init-external-dependencies"> - <!-- Set up filter properties for the called ant targets --> - <!-- org.jboss.security.plugins.PBEUtils outputs the literal string "Encoded password: ", followed by the required hashed password, so some effort is required to remove the literal string --> - <!-- Create the ldapserver.password file. Create the filter for the template login-config.xml with the hashed versioned of the password --> - <!-- Update tolven-ldap-service.xml with the salt and iterations --> - <fail unless="tolven.security.ldap.salt" /> - <fail unless="tolven.security.ldap.iterations" /> - <input message="Please enter the ldap password to be hashed" addproperty="tolven.ldap.password" /> - <input message="Please enter a keystore password to protect the ldap password" addproperty="tolven.ldap.keystore.password" /> - <delete file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> - <mkdir dir="${tolven.security.openssl.ldap.dir}"/> - <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password" failonerror="true"> - <arg value="${tolven.security.ldap.salt}" /> - <arg value="${tolven.security.ldap.iterations}" /> - <arg value="${tolven.ldap.keystore.password}" /> - <arg value="${tolven.ldap.password}" /> - </java> - <replace file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password" token="Encoded password: " value=""/> - <loadfile property="hashed-ldapserver.password" srcFile="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> - <delete file="${tolven.security.openssl.ldap.dir}/temp-ldapserver.password"/> - - <fail unless="tolven.security.db.salt" /> - <fail unless="tolven.security.db.iterations" /> - <input message="Please enter the database password to be hashed" addproperty="tolven.database.password" /> - <input message="Please enter a keystore password to protect the database password" addproperty="tolven.database.keystore.password" /> - <delete file="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> - <mkdir dir="${tolven.security.openssl.db.dir}"/> - <java classname="org.jboss.security.plugins.PBEUtils" classpath="${deploy.location}/lib/jbosssx.jar" output="${tolven.security.openssl.db.dir}/temp-pgserver.password" failonerror="true"> - <arg value="${tolven.security.db.salt}" /> - <arg value="${tolven.security.db.iterations}" /> - <arg value="${tolven.database.keystore.password}" /> - <arg value="${tolven.database.password}" /> - </java> - <replace file="${tolven.security.openssl.db.dir}/temp-pgserver.password" token="Encoded password: " value=""/> - <loadfile property="hashed-pgserver.password" srcFile="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> - <delete file="${tolven.security.openssl.db.dir}/temp-pgserver.password"/> - - <ant target="jbossInit"/> - <ant target="ldapInit"/> - <ant target="databaseInit"/> - </target> - </project> \ No newline at end of file --- 297,299 ---- |
|
From: Joseph I. <jos...@us...> - 2006-09-01 04:54:57
|
Update of /cvsroot/tolven/tolven/template In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23423/template Modified Files: ant-build.template Log Message: Creation of a tolven stage directory which contain a snapshot of all credentials, files etc which are created and deployed by tolven. Index: ant-build.template =================================================================== RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** ant-build.template 21 Aug 2006 00:59:58 -0000 1.38 --- ant-build.template 1 Sep 2006 04:54:55 -0000 1.39 *************** *** 43,46 **** --- 43,48 ---- tolven.security.openssl.db.host-port=${jdbc.host}:5432 + tolven.stage=${tolven.location}/stage + tolven.security.openssl.cert.CountryName=US tolven.security.openssl.cert.StateOrProvince=CA |
|
From: John C. <jc...@us...> - 2006-09-01 01:11:59
|
Update of /cvsroot/tolven/tolvenWEB/web/private In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv782/web/private Modified Files: selectAccount.xhtml Log Message: Ad checkbox to generate patients during login process, on SelectAccount page. Index: selectAccount.xhtml =================================================================== RCS file: /cvsroot/tolven/tolvenWEB/web/private/selectAccount.xhtml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** selectAccount.xhtml 17 Aug 2006 18:29:19 -0000 1.7 --- selectAccount.xhtml 1 Sep 2006 01:11:54 -0000 1.8 *************** *** 73,77 **** --- 73,96 ---- </h:commandLink> </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="Comments"/> + </f:facet> + </h:column> </h:dataTable> + <p> + <h:selectBooleanCheckbox value="#{top.genDemoData}" /> + <h:outputText value="Add 100 demo patients*"/> + </p> + <p>* If checked, 100 new patients will be added to the account you log into. + <b>This will take a few minutes.</b> You can add more patients from the Account Administration + page under Preferences. </p> + <p>The generated patients will have names and dates of birth corresponding to US population distribution. + Addresses and zip codes are within the US roughly in proportion to US demographics. + Patients may have been diagnosed with a disease many + years ago but the data represented in this account will only go back 10 years or so. Not all + pregnancies and not all diagnoses result in data being generated. This accounts for people + that go elsewhere for care or decide not to seek further care. Only a few diagnoses are + generated (so far). They are generated roughly in proportion to the occurance in the US population.</p> </h:panelGroup> </h:form> |
3 messages has been excluded from this view by a project administrator.
