tolven-cvs-commit — Tolven CVS Commit

[Tolven-cvs-commit] tolven/installer build.xml,1.1,1.2

[John C. <jc...@us...>]

Update of /cvsroot/tolven/tolven/installer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19518/installer

Modified Files:
	build.xml 
Log Message:
Change project name to tolven-installer (to avoid conflict with tolven project build.xml)

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	28 Sep 2006 07:14:23 -0000	1.1
--- build.xml	28 Sep 2006 19:00:53 -0000	1.2
***************
*** 1,4 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <project basedir="." default="create-run-tolven-install" name="tolven">
  
  	<property file="../resources/ant-build.properties" />
--- 1,4 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <project basedir="." default="create-run-tolven-install" name="tolven-installer">
  
  	<property file="../resources/ant-build.properties" />

[Tolven-cvs-commit] tolven/installer/izpack-8.1 tolven-install-build.xml, 1.1, 1.2

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/izpack-8.1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8626/installer/izpack-8.1

Modified Files:
	tolven-install-build.xml 
Log Message:
removed a debugging statement

Index: tolven-install-build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/installer/izpack-8.1/tolven-install-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tolven-install-build.xml	28 Sep 2006 07:14:23 -0000	1.1
--- tolven-install-build.xml	28 Sep 2006 07:45:36 -0000	1.2
***************
*** 38,42 ****
  	<target name="deploy-or-undeploy-tolvenEAR">
  		<property name="java.home" value="$JDKPath" />
- 		<echo message="JOE: ${java.home}" />
  		<condition property="target" value="deploy" else="undeploy">
  			<equals arg1="${deploy}" arg2="true" />
--- 38,41 ----

[Tolven-cvs-commit] tolven/installer/izpack-8.1 cvstag_dirname_windows.txt, NONE, 1.1 cvstag_dirname_unix.txt, NONE, 1.1 antActionsSpec.xml, NONE, 1.1 installUserInputSpec.xml, NONE, 1.1 tolven-util-install.xml, NONE, 1.1 utilUserInputSpec.xml, NONE, 1.1 processPanelSpec.xml, NONE, 1.1 tolven-install-build.xml, NONE, 1.1 tolven-install.xml, NONE, 1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/izpack-8.1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/izpack-8.1

Added Files:
	cvstag_dirname_windows.txt cvstag_dirname_unix.txt 
	antActionsSpec.xml installUserInputSpec.xml 
	tolven-util-install.xml utilUserInputSpec.xml 
	processPanelSpec.xml tolven-install-build.xml 
	tolven-install.xml 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: installUserInputSpec.xml ---
<userInput>
	<panel order="0">
		<field type="title" txt="Mail" />
		<field type="text" variable="MAIL_SMTP_HOST">
			<description align="left"
				txt="The address of your SMTP server." />
			<spec txt="Mail SMTP Host:" size="40"
				set="smtp.mydomain.com" />
		</field>
		<field type="text" variable="MAIL_SMTP_AUTH">
			<description align="left"
				txt="If the server requires authentication or not. Many public servers now require authentication." />
			<spec txt="Mail SMTP Auth:" set="true" size="5" />
		</field>
		<field type="text" variable="MAIL_DEBUG">
			<description align="left"
				txt="To get a bunch of log file chatter when establishing a mail connection and sending a message." />
			<spec txt="Mail Debug:" size="5" set="false" />
		</field>
[...1142 lines suppressed...]
		</spec>
		<validator class="com.izforge.sample.PWDValidator"
		txt="Both versions of the password must match" />
		</field>
		<field type="text" variable="DB_HOST_USER">
		<description align="left"
		txt="Please enter the login ID and password to copy credentials to the DB Host" />
		<spec txt="User Login ID:" size="20" set="postgres" />
		</field>
		<field type="password" variable="DB_HOST_PASSWORD">
		<spec>
		<pwd txt="Password:" size="20" set="" />
		<pwd txt="Retype Password:" size="20" set="" />
		</spec>
		<validator class="com.izforge.sample.PWDValidator"
		txt="Both versions of the password must match" />
		</field>
		</panel>
	-->
</userInput>
--- NEW FILE: tolven-util-install.xml ---
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
<installation version="1.0">
	<info>tolvenB20060927
		<appname>Tolven Stage Installation</appname>
		<appversion>alpha1</appversion>
		<appsubpath>tolvenhome</appsubpath>
		<authors>
			<author name="John Churin"
				email="joh...@to..." />
			<author name="Joseph Isaac"
				email="jos...@to..." />
		</authors>
		<uninstaller>uninstall-tolven.jar</uninstaller>
		<url>http://www.tolvenhealth.org/</url>
		<javaversion>1.5</javaversion>
	</info>

	<guiprefs width="640" height="480" resizable="no" />

	<locale>
		<langpack iso3="eng" />
		<langpack iso3="spa" />
	</locale>

	<resources>
		<res id="installer.langsel.img" src="../images/tolven-logo.png" />
		<res id="LicencePanel.licence" src="../../lgpl.txt" />
		<res id="InfoPanel.info" src="../../readme.txt" />
		<res id="TargetPanel.dir.unix" src="cvstag_dirname_unix.txt" />
		<res id="TargetPanel.dir.windows" src="cvstag_dirname_windows.txt" />
		<res id="userInputSpec.xml" src="utilUserInputSpec.xml" />
		<res id="AntActionsSpec.xml" src="antActionsSpec.xml" />
		<res id="ProcessPanel.Spec.xml" src="processPanelSpec.xml" />
	</resources>

	<panels>
		<panel classname="HelloPanel" />>
		<panel classname="InfoPanel" />
		<panel classname="LicencePanel" />
		<panel classname="JDKPathPanel" />
		<panel classname="TargetPanel" />
		<panel classname="PacksPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="SummaryPanel" />
		<panel classname="InstallPanel" />
		<panel classname="FinishPanel" />
	</panels>

	<listeners>
		<listener installer="AntActionInstallerListener"
			uninstaller="AntActionUninstallerListener" />
	</listeners>
	<jar src="../apache-ant-1.6.5/lib/ant.jar" />
	<jar src="../apache-ant-1.6.5/lib/ant-launcher.jar" />
	<jar src="../apache-ant-1.6.5/lib/ant-jsch.jar" />
	<jar src="../apache-ant-1.6.5/lib/jsch-0.1.28.jar" />

	<packs>
		<pack name="base" required="yes">
			<description>The base files</description>
			<file src="tolven-install-build.xml"
				targetdir="$INSTALL_PATH" />
			<parsable targetfile="$INSTALL_PATH/tolven-install-build.xml" />
		</pack>
		<pack name="create-tolven-stage" preselected="no" required="no">
			<description>Create Tolven Stage</description>
		</pack>
		<pack name="deploy-from-stage" preselected="no" required="no">
			<description>Deploy Tolven Stage</description>
		</pack>
		<pack name="initialize-ldap" preselected="no" required="no">
			<description>Initialize LDAP</description>
		</pack>
		<pack name="initialize-db" preselected="no" required="no">
			<description>Initialize Database</description>
		</pack>
		<pack name="deploy-or-undeploy-tolvenEAR" preselected="no" required="no">
			<description>Deploy/Undeploy Tolven EAR</description>
		</pack>
	</packs>
</installation>

--- NEW FILE: cvstag_dirname_windows.txt ---
c:/tolvenB20060927
--- NEW FILE: antActionsSpec.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<antactions>
	<pack name="create-ant-and-tolven-properties">
	<antcall order="afterpacks" basedir="$INSTALL_PATH" buildfile="$INSTALL_PATH/tolven-install-build.xml">
		<target name="os-fix" />
		<property name="src.file" value="$INSTALL_PATH/ant-build.template" />
		<property name="dest.file" value="$INSTALL_PATH/tolven/resources/ant-build.properties" />
	</antcall>
	<antcall order="afterpacks" basedir="$INSTALL_PATH" buildfile="$INSTALL_PATH/tolven-install-build.xml">
		<target name="os-fix" />
		<property name="src.file" value="$INSTALL_PATH/tolven.template" />
		<property name="dest.file" value="$INSTALL_PATH/tolven/resources/tolven.properties" />
	</antcall>
	</pack>
	<pack name="install-tolven-jboss.4.0.4.GA">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="unzip-tolven-jboss" />
	</antcall>
	</pack>
	<pack name="create-tolven-stage">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="stage-init" />
	</antcall>
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven/security-config" buildfile="$INSTALL_PATH/tolven/security-config/build.xml">
		<target name="all" />
		<property name="tolven.key" value="$ONE_PASSWORD" />
		<property name="tolven.ldap.password" value="$LDAP_PASSWORD" />
		<property name="tolven.ldap.keystore.password" value="$LDAP_KEYSTORE_PASSWORD" />
		<property name="tolven.database.password" value="$DB_PASSWORD" />
		<property name="tolven.database.keystore.password" value="$DB_KEYSTORE_PASSWORD" />
	</antcall>
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="stage-init-merge-credentials" />
	</antcall>
	</pack>
	<pack name="deploy-ldap-from-stage">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="deploy-ldap-from-stage" />
		<property name="ldap.host" value="$LDAP_HOST" />
		<property name="ldap.port" value="$LDAP_PORT" />
		<property name="ldap.location.browsable" value="$LDAP_HOST_BROWSABLE" />
		<property name="ldap.host.user" value="$LDAP_HOST_USER" />
		<property name="tolven.ldap.host.password" value="$LDAP_HOST_PASSWORD" />
	</antcall>
	</pack>
	<pack name="deploy-db-from-stage">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="deploy-db-from-stage" />
		<property name="postgres.location.browsable" value="$DB_HOST_BROWSABLE" />
		<property name="postgres.host.user" value="$DB_HOST_USER" />
		<property name="tolven.pg.host.password" value="$DB_HOST_PASSWORD" />
	</antcall>
	</pack>
	<pack name="deploy-jboss-from-stage">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="deploy-jboss-from-stage" />
	</antcall>
	</pack>
	<pack name="deploy-pg-client-credentials-from-stage">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="deploy-pg-client-credentials-from-stage" />
	</antcall>
	</pack>
	<pack name="initialize-ldap">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="ldapInit" />
		<property name="ldap.location.browsable" value="$LDAP_HOST_BROWSABLE" />
		<property name="ldap.host" value="$LDAP_HOST" />
		<property name="ldap.port" value="$LDAP_PORT" />
		<property name="ldap.location" value="$LDAP_LOCATION" />
		<property name="ldap.host.user" value="$LDAP_HOST_USER" />
		<property name="tolven.ldap.host.password" value="$LDAP_HOST_PASSWORD" />
	</antcall>
	</pack>
	<pack name="initialize-db">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml" failonerror="false">
		<target name="databaseInit" />
		<property name="tolven.database.password" value="$DB_PASSWORD" />
	</antcall>
	</pack>
	<pack name="deploy-or-undeploy-tolvenEAR">
	<antcall order="afterpacks" basedir="$INSTALL_PATH/tolven" buildfile="$INSTALL_PATH/tolven/build.xml">
		<target name="deploy" />
	</antcall>
	</pack>
</antactions>

--- NEW FILE: processPanelSpec.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<processing>
	<job name="deploy-undeploy">
		<executefile name="c:/apache-ant-1.6.5/bin/ant.bat">
			<arg>-buildfile</arg>
			<arg>$INSTALL_PATH/tolven/build.xml</arg>
			<arg>$DEPLOY</arg>
		</executefile>
	</job>
</processing>
--- NEW FILE: tolven-install.xml ---
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
<installation version="1.0">
	<info>
		tolvenB20060927
		<appname>Tolven Full Installation</appname>
		<appversion>alpha1</appversion>
		<appsubpath>tolvenhome</appsubpath>
		<authors>
			<author name="John Churin"
				email="joh...@to..." />
			<author name="Joseph Isaac"
				email="jos...@to..." />
		</authors>
		<uninstaller>uninstall-tolven.jar</uninstaller>
		<url>http://www.tolvenhealth.org/</url>
		<javaversion>1.5</javaversion>
	</info>

	<guiprefs width="800" height="600" resizable="no" />

	<locale>
		<langpack iso3="eng" />
		<langpack iso3="spa" />
	</locale>

	<resources>
		<res id="installer.langsel.img" src="../images/tolven-logo.png" />
		<res id="LicencePanel.licence" src="../../lgpl.txt" />
		<res id="InfoPanel.info" src="../../readme.txt" />
		<res id="TargetPanel.dir.unix" src="cvstag_dirname_unix.txt" />
		<res id="TargetPanel.dir.windows"
			src="cvstag_dirname_windows.txt" />
		<res id="userInputSpec.xml" src="installUserInputSpec.xml" />
		<res id="AntActionsSpec.xml" src="antActionsSpec.xml" />
	</resources>

	<panels>
		<panel classname="HelloPanel" />
		<panel classname="InfoPanel" />
		<panel classname="LicencePanel" />
		<panel classname="JDKPathPanel" />
		<panel classname="TargetPanel" />
		<panel classname="PacksPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="UserInputPanel" />
		<panel classname="SummaryPanel" />
		<panel classname="InstallPanel" />
		<panel classname="FinishPanel" />
	</panels>

	<listeners>
		<listener installer="AntActionInstallerListener"
			uninstaller="AntActionUninstallerListener" />
	</listeners>
	<jar src="../apache-ant-1.6.5/lib/ant.jar" />
	<jar src="../apache-ant-1.6.5/lib/ant-launcher.jar" />
	<jar src="../apache-ant-1.6.5/lib/ant-jsch.jar" />
	<jar src="../apache-ant-1.6.5/lib/jsch-0.1.28.jar" />

	<packs>
		<pack name="base" required="yes">
			<description>The base files</description>
			<file src="tolven-install-build.xml"
				targetdir="$INSTALL_PATH" />
			<parsable
				targetfile="$INSTALL_PATH/tolven-install-build.xml" />
			<file src="../template/ant-build.template"
				targetdir="$INSTALL_PATH" />
			<parsable targetfile="$INSTALL_PATH/ant-build.template" />
			<file src="../template/tolven.template"
				targetdir="$INSTALL_PATH" />
			<parsable targetfile="$INSTALL_PATH/tolven.template" />
		</pack>
		<pack name="install-tolven" required="yes">
			<description>Install Tolven</description>
			<depends packname="base" />
			<fileset dir="../../.." targetdir="$INSTALL_PATH" includes="tolven/**" excludes="tolven/build/**" />
			<fileset dir="../../.." targetdir="$INSTALL_PATH" includes="tolvenEJB/**" excludes="tolvenEJB/bin/**,tolvenEJB/build/**" />
			<fileset dir="../../.." targetdir="$INSTALL_PATH" includes="tolvenWEB/**" excludes="tolvenWEB/bin/**,tolvenWEB/build/**" />
		</pack>
		<pack name="create-ant-and-tolven-properties" required="yes">
			<description>
				Create ant-build.properties and tolven-build.properties
			</description>
			<depends packname="install-tolven" />
		</pack>
		<pack name="install-tolven-jboss.4.0.4.GA" required="yes">
			<description>
				Unzip Tolven JBoss and Create Properties
			</description>
			<depends packname="create-ant-and-tolven-properties" />
		</pack>
		<pack name="create-tolven-stage" required="yes">
			<description>Create Tolven Stage</description>
			<depends packname="create-ant-and-tolven-properties" />
		</pack>
		<pack name="deploy-ldap-from-stage" required="no">
			<description>Deploy To LDAP From Tolven Stage</description>
			<depends packname="create-tolven-stage" />
		</pack>
		<pack name="deploy-db-from-stage" required="no">
			<description>
				Deploy To Postgresql From Tolven Stage
			</description>
			<depends packname="create-tolven-stage" />
		</pack>
		<pack name="deploy-jboss-from-stage" required="no">
			<description>Deploy To JBoss From Tolven Stage</description>
			<depends packname="create-tolven-stage" />
		</pack>
		<pack name="deploy-pg-client-credentials-from-stage"
			required="no">
			<description>
				Deploy To Postgresql Client From Tolven Stage
			</description>
			<depends packname="create-tolven-stage" />
		</pack>
		<pack name="initialize-ldap" required="no">
			<description>Initialize LDAP</description>
			<depends packname="create-tolven-stage" />
		</pack>
		<pack name="deploy-tolven-EAR" required="no">
			<description>Deploy tolven.EAR</description>
			<depends packname="create-tolven-stage" />
		</pack>
	</packs>
</installation>

--- NEW FILE: cvstag_dirname_unix.txt ---
/usr/local/tolvenB20060927
--- NEW FILE: tolven-install-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="os-fix" name="tolven">
	
	<target name="os-fix">
		<condition property="target" value="windows" else="unix">
			<os family="windows" />
		</condition>
		<antcall target="${target}" />
	</target>
	
	<target name="windows">
		<move file="${src.file}" tofile="${dest.file}">
			<filterchain>
				<tokenfilter>
					<replacestring from="\" to="/" />
				</tokenfilter>
			</filterchain>
		</move>
	</target>

	<target name="unix">
		<move file="${src.file}" tofile="${dest.file}">
			<filterchain>
				<tokenfilter>
					<replacestring from="\" to="/" />
				</tokenfilter>
			</filterchain>
			<filterchain>
				<tokenfilter>
					<replacestring from="$${openSSL.location}/bin/openSSL.exe" to="openssl" />
					<replacestring from="$${openLDAP.location}/bin/slappasswd.exe" to="slappasswd" />
					<replacestring from="$${java.home}/bin/keytool.exe" to="keytool" />
				</tokenfilter>
			</filterchain>
		</move>
	</target>

	<target name="deploy-or-undeploy-tolvenEAR">
		<property name="java.home" value="$JDKPath" />
		<echo message="JOE: ${java.home}" />
		<condition property="target" value="deploy" else="undeploy">
			<equals arg1="${deploy}" arg2="true" />
		</condition>
        <ant dir="$INSTALL_PATH" antfile="$INSTALL_PATH/tolven/build.xml" target="${target}" inheritAll="false"/>
	</target>

</project>

--- NEW FILE: utilUserInputSpec.xml ---
<userInput>
	<panel order="0">
		<createForPack name="initialize-ldap" />
		<field type="title" txt="LDAP Host" />
		<field type="text" variable="LDAP_HOST">
			<description align="left"
				txt="Tolven needs to communicate with LDAP in order to create users. (Tolven doesn't handle logins which are done by JAAS)." />
			<spec txt="Hostname or IP:" size="20" set="localhost" />
		</field>
		<field type="text" variable="LDAP_PORT">
			<spec txt="LDAP Port:" size="10" set="636" />
		</field>
		<field type="staticText" align="left"
			txt="If True is selected, then browse to the LDAP home directory." />
		<field type="staticText" align="left"
			txt="If False is selected, then the LDAP home directory on the target machine should be entered into the combobox manually." />
		<field type="radio" variable="LDAP_HOST_BROWSABLE">
			<description align="left"
				txt="Can Browse to LDAP Home Directory:" />
			<spec>
				<choice txt="True" value="true" set="true" />
				<choice txt="False" value="false" />
			</spec>
		</field>
		<field type="search" variable="LDAP_LOCATION">
			<spec txt="Local or Browsable LDAP Location:" type="directory" result="file">
				<choice value="/etc/openldap" os="unix" />
				<choice value="c:\OpenLDAP" os="windows" />
			</spec>
		</field>
		<field type="staticText" align="left"
			txt="The information below is only required if the 'Can Browse to LDAP Home Directory' set to False:" />
		<field type="text" variable="LDAP_HOST_USER">
			<description align="left"
				txt="Please enter the login ID and password to copy credentials to the LDAP Host" />
			<spec txt="User Login ID:" size="20" set="ldap" />
		</field>
		<field type="password" variable="LDAP_HOST_PASSWORD">
			<spec>
				<pwd txt="Password:" size="20" set="" />
				<pwd txt="Retype Password:" size="20" set="" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
	</panel>
	<panel order="1">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="LDAP Server" />
		<field type="text" variable="LDAP_BASEDN">
			<spec txt="Base DN:" size="30"
				set="ou=people,dc=tolven,dc=com" />
		</field>
		<field type="text" variable="LDAP_GENGROUPDN">
			<spec txt="General Group DN:" size="30"
				set="cn=gen,ou=groups,dc=tolven,dc=com" />
		</field>
		<field type="text" variable="LDAP_ROOTDN">
			<spec txt="Root DN:" size="30"
				set="cn=Manager,dc=tolven,dc=com" />
		</field>
		<field type="password" variable="LDAP_PASSWORD">
			<description align="left"
				txt="Please enter the LDAP password to be hashed" />
			<spec>
				<pwd txt="LDAP Password:" size="20" set="secret" />
				<pwd txt="Retype password" size="20" set="secret" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
		<field type="password" variable="LDAP_KEYSTORE_PASSWORD">
			<description align="left"
				txt="Please enter a keystore password to protect the LDAP password" />
			<spec>
				<pwd txt="LDAP KeyStore Password:" size="20"
					set="changeit" />
				<pwd txt="Retype password" size="20" set="changeit" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
		<field type="text" variable="LDAP_SALT">
			<spec txt="LDAP Salt:" size="20" set="hgfedcba" />
		</field>
		<field type="text" variable="LDAP_ITERATIONS">
			<spec txt="LDAP Iterations:" size="20" set="13" />
		</field>
	</panel>
	<panel order="2">
		<createForPack name="initialize-db" />
		<field type="title" txt="Initialize Postgresql Database" />
		<field type="password" variable="DB_PASSWORD">
			<description align="left"
				txt="Please enter the database password." />
			<spec>
				<pwd txt="Password:" size="20" set="postgres" />
				<pwd txt="Retype Password:" size="20" set="postgres" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
	</panel>
	<panel order="3">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="Postgresql Host" />
		<field type="text" variable="DB_HOST">
			<spec txt="Hostname or IP:" size="20" set="localhost" />
		</field>
		<field type="text" variable="DB_PORT">
			<spec txt="Port:" size="20" set="5432" />
		</field>
		<field type="staticText" align="left"
			txt="If True is selected, then browse to the Postgresql home directory." />
		<field type="staticText" align="left"
			txt="If False is selected, then the Postgresql home directory on the target machine should be entered into the combobox manually." />
		<field type="radio" variable="DB_HOST_BROWSABLE">
			<description align="left"
				txt="Can Browse to Postgresql Home Directory:" />
			<spec>
				<choice txt="True" value="true" set="true" />
				<choice txt="False" value="false" />
			</spec>
		</field>
		<field type="search" variable="DB_LOCATION">
			<spec txt="Postgresql Home Directory:" type="directory" result="file">
				<choice value="/var/lib/pgsql" os="unix" />
				<choice value="c:\postgreSQL\8.1" os="windows" />
			</spec>
		</field>
		<field type="staticText" align="left"
			txt="The information below is only required if the 'Can Browse to Postgresql Home' radio button is set to false." />
		<field type="text" variable="DB_HOST_USER">
			<description align="left"
				txt="Please enter the login ID and password to copy credentials to the Postgresql Host" />
			<spec txt="User Login ID:" size="20" set="postgres" />
		</field>
		<field type="password" variable="DB_HOST_PASSWORD">
			<spec>
				<pwd txt="Password:" size="20" set="" />
				<pwd txt="Retype Password:" size="20" set="" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
	</panel>
	<panel order="4">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="Postgresql Server" />
		<field type="text" variable="DB_NAME">
			<spec txt="Database Name:" size="20" set="postgres" />
		</field>
		<field type="text" variable="DB_USER">
			<spec txt="Database User:" size="20" set="postgres" />
		</field>
		<field type="password" variable="DB_PASSWORD">
			<description align="left"
				txt="Please enter the database password to be hashed" />
			<spec>
				<pwd txt="Password:" size="20" set="postgres" />
				<pwd txt="Retype Password:" size="20" set="postgres" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
		<field type="password" variable="DB_KEYSTORE_PASSWORD">
			<description align="left"
				txt="Please enter a keystore password to protect the postgres password" />
			<spec>
				<pwd txt="Keystore Password:" size="20" set="changeit" />
				<pwd txt="Retype Password:" size="20" set="changeit" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
		<field type="text" variable="DB_SALT">
			<spec txt="Password Hash Salt:" size="20" set="abcdefgh" />
		</field>
		<field type="text" variable="DB_ITERATIONS">
			<spec txt="Password Hash Iterations:" size="20" set="13" />
		</field>
		<field type="staticText" align="left"
			txt="Postgresql clients will need a client certificate to communicate with the Postgresql database (this is usually found in the postgresql directory located in the user's home directory on a unix system or the 'Application Data/postgresql' directory in the user's home directory on windows." />
		<field type="staticText" align="left"
			txt="Click true if existing client certificate should be be modified with the required Postgresql database certificate. In addition, if one does not exist, it will be created." />
		<field type="staticText" align="left"
			txt="Click false, if a new certificate should always be copied to the client directory, replacing any that already exists." />
		<field type="radio" variable="USE_PG_CLIENT_CERT">
			<spec>
				<choice txt="True" value="true" set="true" />
				<choice txt="False" value="false" />
			</spec>
		</field>
	</panel>
	<panel order="5">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="JBoss" />
		<field type="text" variable="JBOSS_HOST">
			<spec txt="WebServer Hostname or IP:" size="20"
				set="localhost" />
		</field>
		<field type="text" variable="WEBSERVER_HTTP_PORT">
			<spec txt="WebServer HTTP Port:" size="20" set="8080" />
		</field>
		<field type="text" variable="WEBSERVER_HTTPS_PORT">
			<spec txt="WebServer HTTPS Port:" size="20" set="8443" />
		</field>
		<field type="text" variable="WEBSERVER_HTTP_REDIRECTPORT">
			<spec txt="WebServer Redirect Port:" size="20" set="8443" />
		</field>
	</panel>
	<panel order="6">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="CA Credentials" />
		<field type="text" variable="CERT_COUNTRY_NAME">
			<spec txt="Country Name:" size="35" set="US" />
		</field>
		<field type="text" variable="CERT_STATE_OR_PROVINCE">
			<spec txt="State or Province:" size="35" set="CA" />
		</field>
		<field type="text" variable="CERT_ORGANIZATION_NAME">
			<spec txt="Organization Name:" size="35"
				set="Tolven Healthcare Innovations" />
		</field>
		<field type="text" variable="CERT_ORGANIZATION_UNIT_NAME">
			<spec txt="Organization Unit Name:" size="35"
				set="Tolven Demo" />
		</field>

		<field type="text" variable="CERT_CA_COMMON_NAME">
			<spec txt="CA Common Name:" size="35"
				set="tolven-demo-ca-host" />
		</field>
		<field type="rule" variable="CERT_CA_EMAIL">
			<spec txt="CA Email:" layout="O:12:U @ O:8:40 . A:3:3"
				set="0:tolven-demo-ca-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
		<field type="password" variable="ONE_PASSWORD">
			<description align="left"
				txt="Please enter single password for all keys and stores" />
			<spec>
				<pwd txt="Single Password:" size="20" set="changeit" />
				<pwd txt="Retype password" size="20" set="changeit" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
	</panel>
	<panel order="7">
		<createForPack name="create-tolven-stage" />
		<field type="title" txt="Server Credentials" />
		<field type="staticText" align="left"
			txt="Common Name (CN) and Email addresses for certificates." />
		<field type="text" variable="CERT_JBOSS_COMMON_NAME">
			<spec txt="JBoss CN:" size="40"
				set="tolven-demo-jboss-host" />
		</field>
		<field type="rule" variable="CERT_JBOSS_EMAIL">
			<spec txt="JBoss Email:" layout="O:15:U @ O:15:40 . A:3:3"
				set="0:tolven-demo-jboss-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
		<field type="text" variable="CERT_LDAP_COMMON_NAME">
			<spec txt="LDAP CN:" size="40" set="tolven-demo-ldap-host" />
		</field>
		<field type="rule" variable="CERT_LDAP_EMAIL">
			<spec txt="LDAP Email:" layout="O:15:U @ O:15:40 . A:3:3"
				set="0:tolven-demo-ldap-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
		<field type="text" variable="CERT_DB_COMMON_NAME">
			<spec txt="DB CN:" size="40" set="tolven-demo-db-host" />
		</field>
		<field type="rule" variable="CERT_DB_EMAIL">
			<spec txt="DB Email:" layout="O:15:U @ O:15:40 . A:3:3"
				set="0:tolven-demo-db-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
		<field type="text" variable="CERT_WEBSERVER_COMMON_NAME">
			<spec txt="WebServer CN:" size="40"
				set="tolven-demo-webserver-host" />
		</field>
		<field type="rule" variable="CERT_WEBSERVER_EMAIL">
			<spec txt="WebServer Email:"
				layout="O:15:U @ O:15:40 . A:3:3"
				set="0:tolven-demo-webserver-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
		<field type="text" variable="CERT_PG_CLIENT_COMMON_NAME">
			<spec txt="PG_Client CN:" size="40"
				set="tolven-demo-pg-client-host" />
		</field>
		<field type="rule" variable="CERT_PG_CLIENT_EMAIL">
			<spec txt="PG_Client Email:"
				layout="O:15:U @ O:15:40 . A:3:3"
				set="0:tolven-demo-pg-client-host 1:tolvendev 2:com"
				resultFormat="displayFormat" />
			<validator
				class="com.izforge.izpack.util.RegularExpressionValidator"
				txt="Invalid email address!">
				<param name="pattern"
					value="[a-zA-Z0-9._-]{3,}@[a-zA-Z0-9._-]+([.][a-zA-Z0-9_-]+)*[.][a-zA-Z0-9._-]{2,4}" />
			</validator>
		</field>
	</panel>
	<panel order="8">
		<createForPack name="deploy-tolven-stage" />
		<field type="title" txt="Deploy" />
		<field type="staticText" align="left"
			txt="Login and password IDs are only required if the stage is to be deployed to a remote server." />
		<field type="staticText" align="left"
			txt="They are not used or required for localhost deployment." />
		<field type="text" variable="LDAP_HOST_USER">
			<description align="left"
				txt="Please enter the login ID and password to copy credentials to the LDAP Host" />
			<spec txt="User Login ID:" size="20" set="ldap" />
		</field>
		<field type="password" variable="LDAP_HOST_PASSWORD">
			<spec>
				<pwd txt="Password:" size="20" set="" />
				<pwd txt="Retype Password:" size="20" set="" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
		<field type="text" variable="DB_HOST_USER">
			<description align="left"
				txt="Please enter the login ID and password to copy credentials to the DB Host" />
			<spec txt="User Login ID:" size="20" set="postgres" />
		</field>
		<field type="password" variable="DB_HOST_PASSWORD">
			<spec>
				<pwd txt="Password:" size="20" set="" />
				<pwd txt="Retype Password:" size="20" set="" />
			</spec>
			<validator class="com.izforge.sample.PWDValidator"
				txt="Both versions of the password must match" />
		</field>
	</panel>
	<panel order="9">
		<createForPack name="deploy-or-undeploy-tolvenEAR" />
		<field type="title" txt="Deploy tolven.EAR" />
		<field type="radio" variable="DEPLOY">
			<spec>
				<choice txt="Deploy tolven.ear" value="deploy" set="true" />
				<choice txt="Undeploy tolven.ear" value="undeploy" />
			</spec>
		</field>
	</panel>
</userInput>

[Tolven-cvs-commit] tolven/installer/izpack-8.1/src-modifications AntAction.java, NONE, 1.1 AntActionInstallerListener.java, NONE, 1.1 ActionBase.java, NONE, 1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/izpack-8.1/src-modifications
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/izpack-8.1/src-modifications

Added Files:
	AntAction.java AntActionInstallerListener.java ActionBase.java 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: AntActionInstallerListener.java ---
/*
 * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
 * 
 * http://www.izforge.com/izpack/
 * http://developer.berlios.de/projects/izpack/
 * 
 * Copyright 2004 Klaus Bartz
 * Copyright 2004 Thomas Guenter
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0
 *     
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.izforge.izpack.event;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;

import net.n3.nanoxml.XMLElement;

import com.izforge.izpack.Pack;
import com.izforge.izpack.installer.AutomatedInstallData;
import com.izforge.izpack.installer.InstallerException;
import com.izforge.izpack.installer.UninstallData;
import com.izforge.izpack.util.AbstractUIProgressHandler;
import com.izforge.izpack.util.Debug;
import com.izforge.izpack.util.ExtendedUIProgressHandler;
import com.izforge.izpack.util.SpecHelper;
import com.izforge.izpack.util.VariableSubstitutor;

/**
 * Installer listener for performing ANT actions. The definition what should be done will be made in
 * a specification file which is referenced by the resource id "AntActionsSpec.xml". There should be
 * an entry in the install.xml file in the sub ELEMENT "res" of ELEMENT "resources" which references
 * it. The specification of the xml file is done in the DTD antaction.dtd. The xml file specifies,
 * for what pack what ant call should be performed at what time of installation.
 * 
 * @author Thomas Guenter
 * @author Klaus Bartz
 */
public class AntActionInstallerListener extends SimpleInstallerListener
{

    // ------------------------------------------------------------------------
    // Constant Definitions
    // ------------------------------------------------------------------------
    // --------String constants for parsing the XML specification ------------
    // -------- see class AntAction -----------------------------------------
    /** Name of the specification file */
    public static final String SPEC_FILE_NAME = "AntActionsSpec.xml";

    private HashMap actions = null;

    private ArrayList uninstActions = null;

    /**
     * Default constructor
     */
    public AntActionInstallerListener()
    {
        super(true);
        actions = new HashMap();
        uninstActions = new ArrayList();
    }

    /**
     * Returns the actions map.
     * 
     * @return the actions map
     */
    public HashMap getActions()
    {
        return (actions);
    }

    /*
     * (non-Javadoc)
     * 
     * @see com.izforge.izpack.installer.InstallerListener#beforePacks(com.izforge.izpack.installer.AutomatedInstallData,
     * java.lang.Integer, com.izforge.izpack.util.AbstractUIProgressHandler)
     */
    public void beforePacks(AutomatedInstallData idata, Integer npacks,
            AbstractUIProgressHandler handler) throws Exception
    {
        super.beforePacks(idata, npacks, handler);

        getSpecHelper().readSpec(SPEC_FILE_NAME, new VariableSubstitutor(idata.getVariables()));

        if (getSpecHelper().getSpec() == null) return;

        // Selected packs.
        Iterator iter = idata.selectedPacks.iterator();
        Pack p = null;
        while (iter != null && iter.hasNext())
        {
            p = (Pack) iter.next();

            // Resolve data for current pack.
            XMLElement pack = getSpecHelper().getPackForName(p.name);
            if (pack == null) continue;

            // Prepare the action cache
            HashMap packActions = new HashMap();
            packActions.put(ActionBase.BEFOREPACK, new ArrayList());
            packActions.put(ActionBase.AFTERPACK, new ArrayList());
            packActions.put(ActionBase.BEFOREPACKS, new ArrayList());
            packActions.put(ActionBase.AFTERPACKS, new ArrayList());

            // Get all entries for antcalls.
            Vector antCallEntries = pack.getChildrenNamed(AntAction.ANTCALL);
            if (antCallEntries != null && antCallEntries.size() >= 1)
            {
                Iterator entriesIter = antCallEntries.iterator();
                while (entriesIter != null && entriesIter.hasNext())
                {
                    AntAction act = readAntCall((XMLElement) entriesIter.next());
                    if (act != null)
                    {
                        ((ArrayList) packActions.get(act.getOrder())).add(act);
                    }
                }
                // Set for progress bar interaction.
                if (((ArrayList) packActions.get(ActionBase.AFTERPACKS)).size() > 0)
                    this.setProgressBarCaller();
            }

            actions.put(p.name, packActions);
        }
        iter = idata.availablePacks.iterator();
        while (iter.hasNext())
        {
            String currentPack = ((Pack) iter.next()).name;
            performAllActions(currentPack, ActionBase.BEFOREPACKS, null);
        }
    }

    /*
     * (non-Javadoc)
     * 
     * @see com.izforge.izpack.installer.InstallerListener#beforePack(com.izforge.izpack.Pack,
     * java.lang.Integer, com.izforge.izpack.util.AbstractUIProgressHandler)
     */
    public void beforePack(Pack pack, Integer i, AbstractUIProgressHandler handler)
            throws Exception
    {
        performAllActions(pack.name, ActionBase.BEFOREPACK, handler);
    }

    /*
     * (non-Javadoc)
     * 
     * @see com.izforge.izpack.installer.InstallerListener#afterPack(com.izforge.izpack.Pack,
     * java.lang.Integer, com.izforge.izpack.util.AbstractUIProgressHandler)
     */
    public void afterPack(Pack pack, Integer i, AbstractUIProgressHandler handler) throws Exception
    {
        performAllActions(pack.name, ActionBase.AFTERPACK, handler);
    }

    /*
     * (non-Javadoc)
     * 
     * @see com.izforge.izpack.compiler.InstallerListener#afterPacks(com.izforge.izpack.installer.AutomatedInstallData,
     * com.izforge.izpack.util.AbstractUIProgressHandler)
     */
    public void afterPacks(AutomatedInstallData idata, AbstractUIProgressHandler handler)
            throws Exception
    {
        if (informProgressBar())
        {
            handler.nextStep(getMsg("AntAction.pack"), getProgressBarCallerId(), getActionCount(
                    idata, ActionBase.AFTERPACKS));
        }
        Iterator iter = idata.selectedPacks.iterator();
        while (iter.hasNext())
        {
            String currentPack = ((Pack) iter.next()).name;
            performAllActions(currentPack, ActionBase.AFTERPACKS, handler);
        }
        if (uninstActions.size() > 0)
        {
            UninstallData.getInstance().addAdditionalData("antActions", uninstActions);
        }
    }

    private int getActionCount(AutomatedInstallData idata, String order)
    {
        int retval = 0;
        Iterator iter = idata.selectedPacks.iterator();
        while (iter.hasNext())
        {
            String currentPack = ((Pack) iter.next()).name;
            ArrayList actList = getActions(currentPack, order);
            if (actList != null) retval += actList.size();
        }
        return (retval);
    }

    /**
     * Returns the defined actions for the given pack in the requested order.
     * 
     * @param packName name of the pack for which the actions should be returned
     * @param order order to be used; valid are <i>beforepack</i> and <i>afterpack</i>
     * @return a list which contains all defined actions for the given pack and order
     */
    // -------------------------------------------------------
    protected ArrayList getActions(String packName, String order)
    {
        if (actions == null) return null;

        HashMap packActions = (HashMap) actions.get(packName);
        if (packActions == null || packActions.size() == 0) return null;

        return (ArrayList) packActions.get(order);
    }

    /**
     * Performs all actions which are defined for the given pack and order.
     * 
     * @param packName name of the pack for which the actions should be performed
     * @param order order to be used; valid are <i>beforepack</i> and <i>afterpack</i>
     * @throws InstallerException
     */
    private void performAllActions(String packName, String order, AbstractUIProgressHandler handler)
            throws InstallerException
    {
        ArrayList actList = getActions(packName, order);
        if (actList == null || actList.size() == 0) return;

        Debug.trace("******* Executing all " + order + " actions of " + packName + " ...");
        for (int i = 0; i < actList.size(); i++)
        {
            AntAction act = (AntAction) actList.get(i);
            // Inform progress bar if needed. Works only
            // on AFTER_PACKS
            if (informProgressBar() && handler != null
                    && handler instanceof ExtendedUIProgressHandler
                    && order.equals(ActionBase.AFTERPACKS))
            {
                ((ExtendedUIProgressHandler) handler)
                        .progress((act.getMessageID() != null) ? getMsg(act.getMessageID()) : "");
            }
            try
            {
                act.performInstallAction();
            }
            catch (Exception e)
            {
            	if("false".equals(act.getFailOnError()))
            	{
                    Debug.trace("******* actions of " + packName + " failed, but has failonerror=false...continuing");
            	} else
            	{
            		throw new InstallerException(e);
            	}
            }
            if (act.getUninstallTargets().size() > 0) uninstActions.add(act);
        }
    }

    /**
     * Returns an ant call which is defined in the given XML element.
     * 
     * @param el XML element which contains the description of an ant call
     * @return an ant call which is defined in the given XML element
     * @throws InstallerException
     */
    private AntAction readAntCall(XMLElement el) throws InstallerException
    {
        if (el == null) return null;
        SpecHelper spec = getSpecHelper();
        AntAction act = new AntAction();
        try
        {
            act.setOrder(spec.getRequiredAttribute(el, ActionBase.ORDER));
            act.setUninstallOrder(el.getAttribute(ActionBase.UNINSTALL_ORDER,
                    ActionBase.BEFOREDELETION));
        }
        catch (Exception e)
        {
            throw new InstallerException(e);
        }

        act.setQuiet(spec.isAttributeYes(el, ActionBase.QUIET, false));
        act.setVerbose(spec.isAttributeYes(el, ActionBase.VERBOSE, false));
        act.setBaseDir(el.getAttribute(ActionBase.BASEDIR));
        act.setFailOnError(el.getAttribute(ActionBase.FAILONERROR));
        act.setBuildFile(spec.getRequiredAttribute(el, ActionBase.BUILDFILE));
        String str = el.getAttribute(ActionBase.LOGFILE);
        if (str != null)
        {
            act.setLogFile(str);
        }
        String msgId = el.getAttribute(ActionBase.MESSAGEID);
        if (msgId != null && msgId.length() > 0) act.setMessageID(msgId);

        // read propertyfiles
        Iterator iter = el.getChildrenNamed(ActionBase.PROPERTYFILE).iterator();
        while (iter.hasNext())
        {
            XMLElement propEl = (XMLElement) iter.next();
            act.addPropertyFile(spec.getRequiredAttribute(propEl, ActionBase.PATH));
        }

        // read properties
        iter = el.getChildrenNamed(ActionBase.PROPERTY).iterator();
        while (iter.hasNext())
        {
            XMLElement propEl = (XMLElement) iter.next();
            act.setProperty(spec.getRequiredAttribute(propEl, ActionBase.NAME), spec
                    .getRequiredAttribute(propEl, ActionBase.VALUE));
        }

        // read targets
        iter = el.getChildrenNamed(ActionBase.TARGET).iterator();
        while (iter.hasNext())
        {
            XMLElement targEl = (XMLElement) iter.next();
            act.addTarget(spec.getRequiredAttribute(targEl, ActionBase.NAME));
        }

        // read uninstall rules
        iter = el.getChildrenNamed(ActionBase.UNINSTALL_TARGET).iterator();
        while (iter.hasNext())
        {
            XMLElement utargEl = (XMLElement) iter.next();
            act.addUninstallTarget(spec.getRequiredAttribute(utargEl, ActionBase.NAME));
        }

        return act;
    }

}

--- NEW FILE: AntAction.java ---
/*
 * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
 * 
 * http://www.izforge.com/izpack/
 * http://developer.berlios.de/projects/izpack/
 * 
 * Copyright 2004 Klaus Bartz
 * Copyright 2004 Thomas Guenter
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0
 *     
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.izforge.izpack.event;

import java.io.File;
import java.io.FileInputStream;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;

import org.apache.tools.ant.BuildLogger;
import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.DemuxOutputStream;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.input.DefaultInputHandler;
import org.apache.tools.ant.taskdefs.Ant;
import org.apache.tools.ant.util.JavaEnvUtils;

/**
 * This class contains data and 'perform' logic for ant action listeners.
 * 
 * @author Thomas Guenter
 * @author Klaus Bartz
 * 
 */
public class AntAction extends ActionBase
{

    // --------AntAction specific String constants for ------------
    // --- parsing the XML specification ------------

    private static final long serialVersionUID = 3258131345250005557L;

    public static final String ANTACTIONS = "antactions";

    public static final String ANTACTION = "antaction";

    public static final String ANTCALL = "antcall";

    private boolean quiet = false;

    private boolean verbose = false;

    private Properties properties = null;

    private List targets = null;

    private List uninstallTargets = null;

    private String logFile = null;

    private String basedir = null;

    private String buildFile = null;

    private List propertyFiles = null;

    private String failonerror = null;
    /**
     * Default constructor
     */
    public AntAction()
    {
        super();
        properties = new Properties();
        targets = new ArrayList();
        uninstallTargets = new ArrayList();
        propertyFiles = new ArrayList();
    }

    /**
     * Performs all defined install actions.
     * 
     * Calls {#performAction performAction(false)}.
     * 
     * @throws Exception
     */
    public void performInstallAction() throws Exception
    {
        performAction(false);
    }

    /**
     * Performs all defined uninstall actions.
     * 
     * Calls {#performAction performAction(true)}.
     * 
     * @throws Exception
     */
    public void performUninstallAction() throws Exception
    {
        performAction(true);
    }

    /**
     * Performs all defined actions.
     * 
     * @param uninstall An install/uninstall switch. If this is <tt>true</tt> only the uninstall
     * actions, otherwise only the install actions are being performed.
     * 
     * @see #performInstallAction() for calling all install actions.
     * @see #performUninstallAction() for calling all uninstall actions.
     * 
     * @throws Exception
     */
    public void performAction(boolean uninstall) throws Exception
    {
        if (verbose) System.out.println("Calling ANT with buildfile: " + buildFile);
        SecurityManager oldsm = null;
        if (!JavaEnvUtils.isJavaVersion("1.0") && !JavaEnvUtils.isJavaVersion("1.1"))
            oldsm = System.getSecurityManager();
        PrintStream err = System.err;
        PrintStream out = System.out;
        try
        {
            Project antProj = new Project();
            antProj.setName("antcallproject");
            antProj.addBuildListener(createLogger());
            antProj.setInputHandler(new DefaultInputHandler());
            antProj.setSystemProperties();
            addProperties(antProj, getProperties());
            addPropertiesFromPropertyFiles(antProj);
            // TODO: propertyfiles, logFile
            antProj.fireBuildStarted();
            antProj.init();
            List antcalls = new ArrayList();
            List choosenTargets = (uninstall) ? uninstallTargets : targets;
            if (choosenTargets.size() > 0)
            {
                Ant antcall = null;
                for (int i = 0; i < choosenTargets.size(); i++)
                {
                    antcall = (Ant) antProj.createTask("ant");
                    if (getBaseDir() != null) antcall.setDir(new File(getBaseDir()));
                    antcall.setAntfile(getBuildFile());
                    antcall.setTarget((String) choosenTargets.get(i));
                    antcalls.add(antcall);
                }
            }
            Target target = new Target();
            target.setName("calltarget");

            for (int i = 0; i < antcalls.size(); i++)
            {
                target.addTask((Ant) antcalls.get(i));
            }
            antProj.addTarget(target);
            System.setOut(new PrintStream(new DemuxOutputStream(antProj, false)));
            System.setErr(new PrintStream(new DemuxOutputStream(antProj, true)));
            antProj.executeTarget("calltarget");
        }
        finally
        {
            if (oldsm != null) System.setSecurityManager(oldsm);
            System.setOut(out);
            System.setErr(err);
        }
    }

    /**
     * Returns the base directory.
     * 
     * @return the base directory
     */
    public String getBaseDir()
    {
        return basedir;
    }

    /**
     * Returns the build file.
     * 
     * @return the build file
     */
    public String getBuildFile()
    {
        return buildFile;
    }

    /**
     * Returns failonerror.
     * 
     * @return failonerror
     */
    public String getFailOnError()
    {
        return failonerror;
    }

    /**
     * Sets the base directory to be used to the given string.
     * 
     * @param basedir basedir path to be used
     */
    public void setBaseDir(String basedir)
    {
        this.basedir = basedir;
    }

    /**
     * Sets the build file to be used to the given string.
     * 
     * @param buildFile build file path to be used
     */
    public void setBuildFile(String buildFile)
    {
        this.buildFile = buildFile;
    }

    /**
     * Sets the failonerror to be used to the given string.
     * 
     * @param failonerror true or false
     */
    public void setFailOnError(String failonerror)
    {
        this.failonerror = failonerror;
    }

    /**
     * Returns the current logfile path as string.
     * 
     * @return current logfile path
     */
    public String getLogFile()
    {
        return logFile;
    }

    /**
     * Sets the logfile path to the given string.
     * 
     * @param logFile to be set
     */
    public void setLogFile(String logFile)
    {
        this.logFile = logFile;
    }

    /**
     * Returns the property file paths as list of strings.
     * 
     * @return the property file paths
     */
    public List getPropertyFiles()
    {
        return propertyFiles;
    }

    /**
     * Adds one property file path to the internal list of property file paths.
     * 
     * @param propertyFile to be added
     */
    public void addPropertyFile(String propertyFile)
    {
        this.propertyFiles.add(propertyFile);
    }

    /**
     * Sets the property file path list to the given list. Old settings will be lost.
     * 
     * @param propertyFiles list of property file paths to be set
     */
    public void setPropertyFiles(List propertyFiles)
    {
        this.propertyFiles = propertyFiles;
    }

    /**
     * Returns the properties.
     * 
     * @return the properties
     */
    public Properties getProperties()
    {
        return properties;
    }

    /**
     * Sets the internal properties to the given properties. Old settings will be lost.
     * 
     * @param properties properties to be set
     */
    public void setProperties(Properties properties)
    {
        this.properties = properties;
    }

    /**
     * Sets the given value to the property identified by the given name.
     * 
     * @param name key of the property
     * @param value value to be used for the property
     */
    public void setProperty(String name, String value)
    {
        this.properties.put(name, value);
    }

    /**
     * Returns the value for the property identified by the given name.
     * 
     * @param name name of the property
     * @return value of the property
     */
    public String getProperty(String name)
    {
        return this.properties.getProperty(name);
    }

    /**
     * Returns the quiet state.
     * 
     * @return quiet state
     */
    public boolean isQuiet()
    {
        return quiet;
    }

    /**
     * Sets whether the associated ant task should be performed quiet or not.
     * 
     * @param quiet quiet state to set
     */
    public void setQuiet(boolean quiet)
    {
        this.quiet = quiet;
    }

    /**
     * Returns the targets.
     * 
     * @return the targets
     */
    public List getTargets()
    {
        return targets;
    }

    /**
     * Sets the targets which should be performed at installation time. Old settings are lost.
     * 
     * @param targets list of targets
     */
    public void setTargets(ArrayList targets)
    {
        this.targets = targets;
    }

    /**
     * Adds the given target to the target list which should be performed at installation time.
     * 
     * @param target target to be add
     */
    public void addTarget(String target)
    {
        this.targets.add(target);
    }

    /**
     * Returns the uninstaller targets.
     * 
     * @return the uninstaller targets
     */
    public List getUninstallTargets()
    {
        return uninstallTargets;
    }

    /**
     * Sets the targets which should be performed at uninstallation time. Old settings are lost.
     * 
     * @param targets list of targets
     */
    public void setUninstallTargets(ArrayList targets)
    {
        this.uninstallTargets = targets;
    }

    /**
     * Adds the given target to the target list which should be performed at uninstallation time.
     * 
     * @param target target to be add
     */
    public void addUninstallTarget(String target)
    {
        this.uninstallTargets.add(target);
    }

    /**
     * Returns the verbose state.
     * 
     * @return verbose state
     */
    public boolean isVerbose()
    {
        return verbose;
    }

    /**
     * Sets the verbose state.
     * 
     * @param verbose state to be set
     */
    public void setVerbose(boolean verbose)
    {
        this.verbose = verbose;
    }

    private BuildLogger createLogger()
    {
        int msgOutputLevel = 2;
        if (verbose)
            msgOutputLevel = 4;
        else if (quiet) msgOutputLevel = 1;
        BuildLogger logger = new DefaultLogger();
        logger.setMessageOutputLevel(msgOutputLevel);
        logger.setOutputPrintStream(System.out);
        logger.setErrorPrintStream(System.err);
        return logger;
    }

    private void addProperties(Project proj, Properties props)
    {
        if (proj == null) return;
        if (props.size() > 0)
        {
            Iterator iter = props.keySet().iterator();
            String key = null;
            while (iter.hasNext())
            {
                key = (String) iter.next();
                proj.setProperty(key, props.getProperty(key));
            }
        }
    }

    private void addPropertiesFromPropertyFiles(Project proj) throws Exception
    {
        if (proj == null) return;
        Properties props = new Properties();
        File pf = null;
        FileInputStream fis = null;
        try
        {
            for (int i = 0; i < propertyFiles.size(); i++)
            {
                pf = new File((String) propertyFiles.get(i));
                if (pf.exists())
                {
                    fis = new FileInputStream(pf);
                    props.load(fis);
                    fis.close();
                }
                else
                {
                    throw new Exception("Required propertyfile " + pf
                            + " for antcall doesn't exist.");
                }
            }
        }
        finally
        {
            if (fis != null) fis.close();
        }
        addProperties(proj, props);
    }

}

--- NEW FILE: ActionBase.java ---
/*
 * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
 * 
 * http://www.izforge.com/izpack/
 * http://developer.berlios.de/projects/izpack/
 * 
 * Copyright 2004 Klaus Bartz 
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0
 *     
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.izforge.izpack.event;

import java.io.Serializable;
import java.util.HashSet;

/**
 * Base class for action classes like AntAction.
 * 
 * @author Klaus Bartz
 * 
 */
public class ActionBase implements Serializable
{

    // --- String constants for parsing the XML specification -----------------
    // --- These definitions are placed here because the const strings are -----
    // --- used by more than one InstallerListener and UninstallerListener -----
    // --- class. --------------------------------------------------------------

    private static final long serialVersionUID = 3690478013149884728L;

    public static final String PACK = "pack";

    public static final String NAME = "name";

    // Order related "symbols"
    public static final String ORDER = "order";

    public static final String BEFOREPACK = "beforepack";

    public static final String AFTERPACK = "afterpack";

    public static final String BEFOREPACKS = "beforepacks";

    public static final String AFTERPACKS = "afterpacks";

    public static final String UNINSTALL_ORDER = "uninstall_order";

    public static final String BEFOREDELETION = "beforedeletion";

    public static final String AFTERDELETION = "afterdeletion";

    public static final String PROPERTY = "property";

    public static final String VALUE = "value";

    public static final String YES = "yes";

    public static final String NO = "no";

    public static final String FALSE = "false";

    public static final String TRUE = "true";

    public static final String QUIET = "quiet";

    public static final String VERBOSE = "verbose";

    public static final String LOGFILE = "logfile";

    public static final String BASEDIR = "basedir";
    
    public static final String FAILONERROR = "failonerror";

    public static final String BUILDFILE = "buildfile";

    public static final String PROPERTYFILE = "propertyfile";

    public static final String PATH = "path";

    public static final String SRCDIR = "srcdir";

    public static final String TARGETDIR = "targetdir";

    public static final String TARGET = "target";

    public static final String UNINSTALL_TARGET = "uninstall_target";

    public static final String ACTION = "action";

    public static final String UNINSTALL_ACTION = "uninstall_action";

    public static final String ONDEST = "ondestination";

    public static final String COPY = "copy";

    public static final String REMOVE = "remove";

    public static final String REWIND = "rewind";

    public static final String TOUCH = "touch";

    public static final String MOVE = "move";

    public static final String OVERRIDE = "override";

    public static final String UPDATE = "update";

    public static final String NOTHING = "nothing";

    public static final String FILESET = "fileset";

    public static final String MESSAGEID = "messageid";

    public static final String INCLUDE = "include";

    public static final String INCLUDES = "includes";

    public static final String EXCLUDE = "exclude";

    public static final String EXCLUDES = "excludes";

    public static final String OS = "os";

    public static final String FAMILY = "family";

    public static final String VERSION = "version";

    public static final String ARCH = "arch";

    public static final String CASESENSITIVE = "casesensitive";

    public static final String UNIX = "unix";

    public static final String WINDOWS = "windows";

    public static final String MAC = "mac";

    public static final String ASKTRUE = "asktrue";

    public static final String ASKFALSE = "askfalse";

    private static final HashSet installOrders = new HashSet();

    private static final HashSet uninstallOrders = new HashSet();

    protected String uninstallOrder = ActionBase.BEFOREDELETION;

    protected String order = null;

    protected String messageID = null;

    protected String failonerror = null;

    static
    {
        installOrders.add(ActionBase.BEFOREPACK);
        installOrders.add(ActionBase.AFTERPACK);
        installOrders.add(ActionBase.BEFOREPACKS);
        installOrders.add(ActionBase.AFTERPACKS);
        uninstallOrders.add(ActionBase.BEFOREDELETION);
        uninstallOrders.add(ActionBase.AFTERDELETION);
    }

    /**
     * Default constructor
     */
    public ActionBase()
    {
        super();
    }

    /**
     * Returns the order.
     * 
     * @return the order
     */
    public String getOrder()
    {
        return order;
    }

    /**
     * Sets the order to the given string. Valid values are "beforepacks", "beforepack", "afterpack"
     * and "afterpacks".
     * 
     * @param order order to be set
     */
    public void setOrder(String order) throws Exception
    {
        if (!installOrders.contains(order)) throw new Exception("Bad value for order.");
        this.order = order;
    }

    /**
     * Returns the order for uninstallation.
     * 
     * @return the order for uninstallation
     */
    public String getUninstallOrder()
    {
        return uninstallOrder;
    }

    /**
     * Sets the order to the given string for uninstallation. Valid values are "beforedeletion" and
     * "afterdeletion".
     * 
     * @param order order to be set
     */
    public void setUninstallOrder(String order) throws Exception
    {
        if (!uninstallOrders.contains(order)) throw new Exception("Bad value for order.");
        this.uninstallOrder = order;
    }

    /**
     * Returns the defined message ID for this action.
     * 
     * @return the defined message ID
     */
    public String getMessageID()
    {
        return messageID;
    }

    /**
     * Sets the message ID to the given string.
     * 
     * @param string string to be used as message ID
     */
    public void setMessageID(String string)
    {
        messageID = string;
    }

    /**
     * Returns the defined failonerror for this action.
     * 
     * @return the defined failonerror
     */
    public String getFailOnError()
    {
        return failonerror;
    }

    /**
     * Sets the failonerror to the given string.
     * 
     * @param string string to be used as failonerror
     */
    public void setFailOnError(String string)
    {
        failonerror = string;
    }

}

[Tolven-cvs-commit] tolven/installer/apache-ant-1.6.5/lib ant-jsch.jar, NONE, 1.1 ant.jar, NONE, 1.1 ant-launcher.jar, NONE, 1.1 jsch-0.1.28.jar, NONE, 1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/apache-ant-1.6.5/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/apache-ant-1.6.5/lib

Added Files:
	ant-jsch.jar ant.jar ant-launcher.jar jsch-0.1.28.jar 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: ant.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jsch-0.1.28.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ant-launcher.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: ant-jsch.jar ---
(This appears to be a binary file; contents omitted.)

[Tolven-cvs-commit] tolven/installer/template tolven.template, NONE, 1.1 ant-build.template, NONE, 1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/template

Added Files:
	tolven.template ant-build.template 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: ant-build.template ---
# Tolven top-level location
tolven.home=$INSTALL_PATH
# Location for components used by Tolven
java.home=$JDKPath
jboss.location=${tolven.home}/tolven-jboss-4.0.4.GA
ldap.location=$LDAP_LOCATION
# the browsable flags is used to distinguish between copying credentials to a location which is local (using std copy) or remote (using scp)
ldap.location.browsable=$LDAP_HOST_BROWSABLE
ldap.host=$LDAP_HOST
ldap.port=$LDAP_PORT
postgres.location=$DB_LOCATION
postgres.location.browsable=$DB_HOST_BROWSABLE
jdbc.host=$DB_HOST
jdbc.port=$DB_PORT
db.name=$DB_NAME
jdbc.username=$DB_USER
# For copying credentials to a remoted host the following two properties must be set to avoid being asked for input
# ldap.host.user=someldapuser
# postgres.host.user=somepguser

# Where you want to deploy the Tolven EAR file
deploy.location=${jboss.location}/server/tolven
# JDBC
jdbc.url=jdbc:postgresql://${jdbc.host}/${db.name}?ssl=true
jdbc.url.nonssl=jdbc:postgresql://${jdbc.host}/${db.name}
jdbc.driver=org.postgresql.Driver

# Properties for hashing the database password...the actual password will be asked for during jbossInit
# I believe tolven.security.db.salt and tolven.security.dlap.salt have a lower limit of eight characters (less and there's an error)
tolven.security.ldap.salt=$LDAP_SALT
tolven.security.ldap.iterations=$LDAP_ITERATIONS
tolven.security.db.salt=$DB_SALT
tolven.security.db.iterations=$DB_ITERATIONS

#certificate creation where tolven.security.build.dir is relative to the security-config or could be absolute
tolven.security.openssl.command=${openSSL.location}/bin/openSSL.exe
tolven.security.slappasswd.command=${openLDAP.location}/bin/slappasswd.exe
tolven.security.keytool.command=${java.home}/bin/keytool.exe
tolven.security.credentials.dir=${tolven.location}/security-config/credentials

tolven.security.build.dir=${tolven.location}/build
tolven.security.openssl.ca.dir=${tolven.security.build.dir}/ca
tolven.security.openssl.config=${tolven.security.openssl.ca.dir}/openssl.conf
tolven.security.openssl.jboss.dir=${tolven.security.build.dir}/jboss
tolven.security.openssl.ldap.dir=${tolven.security.build.dir}/ldap
tolven.security.openssl.db.dir=${tolven.security.build.dir}/db
tolven.security.openssl.webserver.dir=${tolven.security.build.dir}/webserver
tolven.security.openssl.ldap.host-port=${ldap.host}:${ldap.port}
tolven.security.openssl.db.host-port=${jdbc.host}:${jdbc.port}

tolven.stage=${tolven.location}/stage
tolven.stage.use-existing-pg-client-cert=$USE_PG_CLIENT_CERT
message.show.copy="true"

tolven.security.openssl.cert.CountryName=$CERT_COUNTRY_NAME
tolven.security.openssl.cert.StateOrProvince=$CERT_STATE_OR_PROVINCE
tolven.security.openssl.cert.OrganizationName=$CERT_ORGANIZATION_NAME
tolven.security.openssl.cert.OrganizationUnitName=$CERT_ORGANIZATION_UNIT_NAME

tolven.security.openssl.cert.ca.CommonName=$CERT_CA_COMMON_NAME
tolven.security.openssl.cert.ca.Email=$CERT_CA_EMAIL
tolven.security.openssl.cert.jboss.CommonName=$CERT_JBOSS_COMMON_NAME
tolven.security.openssl.cert.jboss.Email=$CERT_JBOSS_EMAIL
tolven.security.openssl.cert.ldap.CommonName=$CERT_LDAP_COMMON_NAME
tolven.security.openssl.cert.ldap.Email=$CERT_LDAP_EMAIL
tolven.security.openssl.cert.db.CommonName=$CERT_DB_COMMON_NAME
tolven.security.openssl.cert.db.Email=$CERT_DB_EMAIL
tolven.security.openssl.cert.webserver.CommonName=$CERT_WEBSERVER_COMMON_NAME
tolven.security.openssl.cert.webserver.Email=$CERT_WEBSERVER_EMAIL
tolven.security.openssl.cert.pg.client.CommonName=$CERT_PG_CLIENT_COMMON_NAME
tolven.security.openssl.cert.pg.client.Email=$CERT_PG_CLIENT_EMAIL

# Normally, these don't change
tolven.location=${tolven.home}/tolven
tolvenEJB.location=${tolven.home}/tolvenEJB
tolvenWEB.location=${tolven.home}/tolvenWEB

openSSL.location=${tolven.location}/lib/openSSL
openLDAP.location=${tolven.location}/lib/openLDAP
jaxb.location=${tolven.location}/lib/jaxb
commons-codec.location=${tolven.location}/lib/commons-codec
commons-math.location=${tolven.location}/lib/commons-math
javamail.location=${tolven.location}/lib/javamail
jaf.location=${tolven.location}/lib/jaf
httpcore.location=${tolven.location}/lib/httpcore
junit.location=${tolven.location}/lib/junit
# These libraries are only used in Tolven web application
facelets.location=${tolven.location}/lib/facelets
commons-fileupload.location=${tolven.location}/lib/commons-fileupload
commons-io.location=${tolven.location}/lib/commons-io
jsf.location=${tolven.location}/lib/jsf
jdbc.location=${tolven.location}/lib/jdbc
jfreechart.location=${tolven.location}/lib/jfreechart

# Ant Build Filtering:
# @tolven-jdbc-url@ is replaced with ${jdbc.url} in: tolven-ds.xml, 
# @ldap.java.naming.provider.url@ is replaced with ${ldap.java.naming.provider.url} in: tolven-ldap-service.xml and login-config.xml
ldap.java.naming.provider.url=ldaps://${ldap.host}/
# @deploy.location.conf@ is replaced with ${deploy.location}/conf in tolven-properties-service.xml
# @webserver-http-port@ is replaced with ${webserver.http.port} in server.xml
webserver.http.port=$WEBSERVER_HTTP_PORT
# @webserver-https-port@ is replaced with ${webserver.https.port} in server.xml
webserver.https.port=$WEBSERVER_HTTPS_PORT
# @webserver-http-redirect-port@ is replaced with ${webserver.http-redirect.port} in server.xml
webserver.http-redirect.port=$WEBSERVER_HTTP_REDIRECTPORT

--- NEW FILE: tolven.template ---
# Runtime properties used by Tolven
mail.smtp.host=$MAIL_SMTP_HOST
mail.smtp.auth=$MAIL_SMTP_AUTH
mail.debug=$MAIL_DEBUG
tolven.timezone=$TIMEZONE
tolven.repository.oid=$REPOSITORY_OID
tolven.login.create.demoUser=$CREATE_DEMO_USER
tolven.login.create.activatedUser=$ACTIVATE_USER
tolven.mail.from=$MAIL_FROM
tolven.mail.fromName=$MAIL_FROM_NAME
tolven.mail.user=$MAIL_USER
tolven.mail.password=$MAIL_PASSWORD
tolven.invitation.host=$INVITATION_HOST
tolven.invitation.port=$INVITATION_PORT
tolven.invitation.root=$INVITATION_CONTEXT
tolven.invitation.replyTo=http://$INVITATION_HOST:$INVITATION_PORT/Tolven/private/dispatch.jsf
tolven.ldap.url=ldaps://$LDAP_HOST
tolven.ldap.baseDN=$LDAP_BASEDN
tolven.ldap.genGroupDN=$LDAP_GENGROUPDN
tolven.ldap.rootDN=$LDAP_ROOTDN

[Tolven-cvs-commit] tolven/template ant-build.template,1.46,1.47

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/template

Modified Files:
	ant-build.template 
Log Message:
Introducing IzPack as the tolven installer

Index: ant-build.template
===================================================================
RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ant-build.template	23 Sep 2006 22:19:16 -0000	1.46
--- ant-build.template	28 Sep 2006 07:14:23 -0000	1.47
***************
*** 16,19 ****
--- 16,22 ----
  # postgres.host.user=somepguser
  
+ # IzPack is the current installer technology and it's location is only required for developing the installer aspects of tolven
+ izpack.location=c:/IzPack
+ 
  # Where you want to deploy the Tolven EAR file
  deploy.location=${jboss.location}/server/tolven

[Tolven-cvs-commit] tolven/installer/util tz-sorted.txt,NONE,1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/util
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/util

Added Files:
	tz-sorted.txt 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: tz-sorted.txt ---
ACT
AET
AGT
ART
AST
Africa/Abidjan
Africa/Accra
Africa/Addis_Ababa
Africa/Algiers
Africa/Asmera
Africa/Bamako
Africa/Bangui
Africa/Banjul
Africa/Bissau
Africa/Blantyre
Africa/Brazzaville
Africa/Bujumbura
Africa/Cairo
Africa/Casablanca
Africa/Ceuta
Africa/Conakry
Africa/Dakar
Africa/Dar_es_Salaam
Africa/Djibouti
Africa/Douala
Africa/El_Aaiun
Africa/Freetown
Africa/Gaborone
Africa/Harare
Africa/Johannesburg
Africa/Kampala
Africa/Khartoum
Africa/Kigali
Africa/Kinshasa
Africa/Lagos
Africa/Libreville
Africa/Lome
Africa/Luanda
Africa/Lubumbashi
Africa/Lusaka
Africa/Malabo
Africa/Maputo
Africa/Maseru
Africa/Mbabane
Africa/Mogadishu
Africa/Monrovia
Africa/Nairobi
Africa/Ndjamena
Africa/Niamey
Africa/Nouakchott
Africa/Ouagadougou
Africa/Porto-Novo
Africa/Sao_Tome
Africa/Timbuktu
Africa/Tripoli
Africa/Tunis
Africa/Windhoek
America/Adak
America/Anchorage
America/Anguilla
America/Antigua
America/Araguaina
America/Argentina/Buenos_Aires
America/Argentina/Catamarca
America/Argentina/ComodRivadavia
America/Argentina/Cordoba
America/Argentina/Jujuy
America/Argentina/La_Rioja
America/Argentina/Mendoza
America/Argentina/Rio_Gallegos
America/Argentina/San_Juan
America/Argentina/Tucuman
America/Argentina/Ushuaia
America/Aruba
America/Asuncion
America/Atka
America/Bahia
America/Barbados
America/Belem
America/Belize
America/Boa_Vista
America/Bogota
America/Boise
America/Buenos_Aires
America/Cambridge_Bay
America/Campo_Grande
America/Cancun
America/Caracas
America/Catamarca
America/Cayenne
America/Cayman
America/Chicago
America/Chihuahua
America/Coral_Harbour
America/Cordoba
America/Costa_Rica
America/Cuiaba
America/Curacao
America/Danmarkshavn
America/Dawson
America/Dawson_Creek
America/Denver
America/Detroit
America/Dominica
America/Edmonton
America/Eirunepe
America/El_Salvador
America/Ensenada
America/Fort_Wayne
America/Fortaleza
America/Glace_Bay
America/Godthab
America/Goose_Bay
America/Grand_Turk
America/Grenada
America/Guadeloupe
America/Guatemala
America/Guayaquil
America/Guyana
America/Halifax
America/Havana
America/Hermosillo
America/Indiana/Indianapolis
America/Indiana/Knox
America/Indiana/Marengo
America/Indiana/Vevay
America/Indianapolis
America/Inuvik
America/Iqaluit
America/Jamaica
America/Jujuy
America/Juneau
America/Kentucky/Louisville
America/Kentucky/Monticello
America/Knox_IN
America/La_Paz
America/Lima
America/Los_Angeles
America/Louisville
America/Maceio
America/Managua
America/Manaus
America/Martinique
America/Mazatlan
America/Mendoza
America/Menominee
America/Merida
America/Mexico_City
America/Miquelon
America/Monterrey
America/Montevideo
America/Montreal
America/Montserrat
America/Nassau
America/New_York
America/Nipigon
America/Nome
America/Noronha
America/North_Dakota/Center
America/Panama
America/Pangnirtung
America/Paramaribo
America/Phoenix
America/Port-au-Prince
America/Port_of_Spain
America/Porto_Acre
America/Porto_Velho
America/Puerto_Rico
America/Rainy_River
America/Rankin_Inlet
America/Recife
America/Regina
America/Rio_Branco
America/Rosario
America/Santiago
America/Santo_Domingo
America/Sao_Paulo
America/Scoresbysund
America/Shiprock
America/St_Johns
America/St_Kitts
America/St_Lucia
America/St_Thomas
America/St_Vincent
America/Swift_Current
America/Tegucigalpa
America/Thule
America/Thunder_Bay
America/Tijuana
America/Toronto
America/Tortola
America/Vancouver
America/Virgin
America/Whitehorse
America/Winnipeg
America/Yakutat
America/Yellowknife
Antarctica/Casey
Antarctica/Davis
Antarctica/DumontDUrville
Antarctica/Mawson
Antarctica/McMurdo
Antarctica/Palmer
Antarctica/Rothera
Antarctica/South_Pole
Antarctica/Syowa
Antarctica/Vostok
Arctic/Longyearbyen
Asia/Aden
Asia/Almaty
Asia/Amman
Asia/Anadyr
Asia/Aqtau
Asia/Aqtobe
Asia/Ashgabat
Asia/Ashkhabad
Asia/Baghdad
Asia/Bahrain
Asia/Baku
Asia/Bangkok
Asia/Beirut
Asia/Bishkek
Asia/Brunei
Asia/Calcutta
Asia/Choibalsan
Asia/Chongqing
Asia/Chungking
Asia/Colombo
Asia/Dacca
Asia/Damascus
Asia/Dhaka
Asia/Dili
Asia/Dubai
Asia/Dushanbe
Asia/Gaza
Asia/Harbin
Asia/Hong_Kong
Asia/Hovd
Asia/Irkutsk
Asia/Istanbul
Asia/Jakarta
Asia/Jayapura
Asia/Jerusalem
Asia/Kabul
Asia/Kamchatka
Asia/Karachi
Asia/Kashgar
Asia/Katmandu
Asia/Krasnoyarsk
Asia/Kuala_Lumpur
Asia/Kuching
Asia/Kuwait
Asia/Macao
Asia/Macau
Asia/Magadan
Asia/Makassar
Asia/Manila
Asia/Muscat
Asia/Nicosia
Asia/Novosibirsk
Asia/Omsk
Asia/Oral
Asia/Phnom_Penh
Asia/Pontianak
Asia/Pyongyang
Asia/Qatar
Asia/Qyzylorda
Asia/Rangoon
Asia/Riyadh
Asia/Riyadh87
Asia/Riyadh88
Asia/Riyadh89
Asia/Saigon
Asia/Sakhalin
Asia/Samarkand
Asia/Seoul
Asia/Shanghai
Asia/Singapore
Asia/Taipei
Asia/Tashkent
Asia/Tbilisi
Asia/Tehran
Asia/Tel_Aviv
Asia/Thimbu
Asia/Thimphu
Asia/Tokyo
Asia/Ujung_Pandang
Asia/Ulaanbaatar
Asia/Ulan_Bator
Asia/Urumqi
Asia/Vientiane
Asia/Vladivostok
Asia/Yakutsk
Asia/Yekaterinburg
Asia/Yerevan
Atlantic/Azores
Atlantic/Bermuda
Atlantic/Canary
Atlantic/Cape_Verde
Atlantic/Faeroe
Atlantic/Jan_Mayen
Atlantic/Madeira
Atlantic/Reykjavik
Atlantic/South_Georgia
Atlantic/St_Helena
Atlantic/Stanley
Australia/ACT
Australia/Adelaide
Australia/Brisbane
Australia/Broken_Hill
Australia/Canberra
Australia/Currie
Australia/Darwin
Australia/Hobart
Australia/LHI
Australia/Lindeman
Australia/Lord_Howe
Australia/Melbourne
Australia/NSW
Australia/North
Australia/Perth
Australia/Queensland
Australia/South
Australia/Sydney
Australia/Tasmania
Australia/Victoria
Australia/West
Australia/Yancowinna
BET
BST
Brazil/Acre
Brazil/DeNoronha
Brazil/East
Brazil/West
CAT
CET
CNT
CST
CST6CDT
CTT
Canada/Atlantic
Canada/Central
Canada/East-Saskatchewan
Canada/Eastern
Canada/Mountain
Canada/Newfoundland
Canada/Pacific
Canada/Saskatchewan
Canada/Yukon
Chile/Continental
Chile/EasterIsland
Cuba
EAT
ECT
EET
EST
EST5EDT
Egypt
Eire
Etc/GMT
Etc/GMT+0
Etc/GMT+1
Etc/GMT+10
Etc/GMT+11
Etc/GMT+12
Etc/GMT+2
Etc/GMT+3
Etc/GMT+4
Etc/GMT+5
Etc/GMT+6
Etc/GMT+7
Etc/GMT+8
Etc/GMT+9
Etc/GMT-0
Etc/GMT-1
Etc/GMT-10
Etc/GMT-11
Etc/GMT-12
Etc/GMT-13
Etc/GMT-14
Etc/GMT-2
Etc/GMT-3
Etc/GMT-4
Etc/GMT-5
Etc/GMT-6
Etc/GMT-7
Etc/GMT-8
Etc/GMT-9
Etc/GMT0
Etc/Greenwich
Etc/UCT
Etc/UTC
Etc/Universal
Etc/Zulu
Europe/Amsterdam
Europe/Andorra
Europe/Athens
Europe/Belfast
Europe/Belgrade
Europe/Berlin
Europe/Bratislava
Europe/Brussels
Europe/Bucharest
Europe/Budapest
Europe/Chisinau
Europe/Copenhagen
Europe/Dublin
Europe/Gibraltar
Europe/Helsinki
Europe/Istanbul
Europe/Kaliningrad
Europe/Kiev
Europe/Lisbon
Europe/Ljubljana
Europe/London
Europe/Luxembourg
Europe/Madrid
Europe/Malta
Europe/Mariehamn
Europe/Minsk
Europe/Monaco
Europe/Moscow
Europe/Nicosia
Europe/Oslo
Europe/Paris
Europe/Prague
Europe/Riga
Europe/Rome
Europe/Samara
Europe/San_Marino
Europe/Sarajevo
Europe/Simferopol
Europe/Skopje
Europe/Sofia
Europe/Stockholm
Europe/Tallinn
Europe/Tirane
Europe/Tiraspol
Europe/Uzhgorod
Europe/Vaduz
Europe/Vatican
Europe/Vienna
Europe/Vilnius
Europe/Warsaw
Europe/Zagreb
Europe/Zaporozhye
Europe/Zurich
GB
GB-Eire
GMT
GMT0
Greenwich
HST
Hongkong
IET
IST
Iceland
Indian/Antananarivo
Indian/Chagos
Indian/Christmas
Indian/Cocos
Indian/Comoro
Indian/Kerguelen
Indian/Mahe
Indian/Maldives
Indian/Mauritius
Indian/Mayotte
Indian/Reunion
Iran
Israel
JST
Jamaica
Japan
Kwajalein
Libya
MET
MIT
MST
MST7MDT
Mexico/BajaNorte
Mexico/BajaSur
Mexico/General
Mideast/Riyadh87
Mideast/Riyadh88
Mideast/Riyadh89
NET
NST
NZ
NZ-CHAT
Navajo
PLT
PNT
PRC
PRT
PST
PST8PDT
Pacific/Apia
Pacific/Auckland
Pacific/Chatham
Pacific/Easter
Pacific/Efate
Pacific/Enderbury
Pacific/Fakaofo
Pacific/Fiji
Pacific/Funafuti
Pacific/Galapagos
Pacific/Gambier
Pacific/Guadalcanal
Pacific/Guam
Pacific/Honolulu
Pacific/Johnston
Pacific/Kiritimati
Pacific/Kosrae
Pacific/Kwajalein
Pacific/Majuro
Pacific/Marquesas
Pacific/Midway
Pacific/Nauru
Pacific/Niue
Pacific/Norfolk
Pacific/Noumea
Pacific/Pago_Pago
Pacific/Palau
Pacific/Pitcairn
Pacific/Ponape
Pacific/Port_Moresby
Pacific/Rarotonga
Pacific/Saipan
Pacific/Samoa
Pacific/Tahiti
Pacific/Tarawa
Pacific/Tongatapu
Pacific/Truk
Pacific/Wake
Pacific/Wallis
Pacific/Yap
Poland
Portugal
ROK
SST
Singapore
SystemV/AST4
SystemV/AST4ADT
SystemV/CST6
SystemV/CST6CDT
SystemV/EST5
SystemV/EST5EDT
SystemV/HST10
SystemV/MST7
SystemV/MST7MDT
SystemV/PST8
SystemV/PST8PDT
SystemV/YST9
SystemV/YST9YDT
Turkey
UCT
US/Alaska
US/Aleutian
US/Arizona
US/Central
US/East-Indiana
US/Eastern
US/Hawaii
US/Indiana-Starke
US/Michigan
US/Mountain
US/Pacific
US/Pacific-New
US/Samoa
UTC
Universal
VST
W-SU
WET
Zulu

[Tolven-cvs-commit] tolven/installer build.xml,NONE,1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer

Added Files:
	build.xml 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." default="create-run-tolven-install" name="tolven">

	<property file="../resources/ant-build.properties" />

	<target name="create-run-tolven-install">
		<antcall target="create-tolven-install" />
		<antcall target="run-tolven-install" />
	</target>

	<target name="create-tolven-install">
		<fail unless="izpack.location" />
		<mkdir dir="${tolven.location}/build/izpack-8.1" />
		<delete file="${tolven.location}/build/izpack-8.1/tolven-install.jar" />
		<exec dir="izpack-8.1" executable="${izpack.location}/bin/compile.bat" failonerror="true">
			<arg line="${tolven.location}/installer/izpack-8.1/tolven-install.xml -b . -o ${tolven.location}/build/izpack-8.1/tolven-install.jar -k standard" />
		</exec>
	</target>

	<target name="run-tolven-install">
		<fail unless="izpack.location" />
		<java jar="${tolven.location}/build/izpack-8.1/tolven-install.jar" fork="true" failonerror="true">
			<arg value="-DTRACE" />
			<arg value="-DSTACKTRACE=true" />
			<arg value="-jar" />
		</java>
		<exec dir="${tolven.location}/build/izpack-8.1" executable="java">
			<arg line="-DTRACE=true -DSTACKTRACE=true -jar tolven-install.jar" />
		</exec>
	</target>

	<target name="create-run-tolven-util-install">
		<antcall target="create-tolven-util-install" />
		<antcall target="run-tolven-util-install" />
	</target>

	<target name="create-tolven-util-install">
		<fail unless="izpack.location" />
		<mkdir dir="${tolven.location}/build/izpack-8.1" />
		<delete file="${tolven.location}/build/izpack-8.1/tolven-util-install.jar" />
		<exec dir="izpack-8.1" executable="${izpack.location}/bin/compile.bat" failonerror="true">
			<arg line="${tolven.location}/installer/izpack-8.1/tolven-util-install.xml -b . -o ${tolven.location}/build/izpack-8.1/tolven-util-install.jar -k standard" />
		</exec>
	</target>

	<target name="run-tolven-util-install">
		<fail unless="izpack.location" />
		<java jar="${tolven.location}/build/izpack-8.1/tolven-util-install.jar" fork="true" failonerror="true">
			<arg value="-DTRACE" />
			<arg value="-DSTACKTRACE=true" />
			<arg value="-jar" />
		</java>
		<exec dir="${tolven.location}/build/izpack-8.1" executable="java">
			<arg line="-DTRACE=true -DSTACKTRACE=true -jar tolven-util-install.jar" />
		</exec>
	</target>

	<target name="update-IzPack-with-tolven-src">
		<fail unless="izpack.location" />
		<copy toDir="${izpack.location}/src/lib/com/izforge/izpack/event" overwrite="true" preservelastmodified="true">
			<fileset dir="izpack-8.1/src-modifications">
				<include name="ActionBase.java" />
				<include name="AntAction.java" />
				<include name="AntActionInstallerListener.java" />
			</fileset>
		</copy>
		<ant dir="${izpack.location}" antfile="${izpack.location}/src/build.xml" target="all" />
	</target>

</project>

[Tolven-cvs-commit] tolven/installer/images tolven-logo.png, NONE, 1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/images
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27985/installer/images

Added Files:
	tolven-logo.png 
Log Message:
Introducing IzPack as the tolven installer

--- NEW FILE: tolven-logo.png ---
(This appears to be a binary file; contents omitted.)

[Tolven-cvs-commit] tolven/installer/images - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/images
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/images

Log Message:
Directory /cvsroot/tolven/tolven/installer/images added to the repository

[Tolven-cvs-commit] tolven/installer/izpack-8.1/src-modifications - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/izpack-8.1/src-modifications
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/izpack-8.1/src-modifications

Log Message:
Directory /cvsroot/tolven/tolven/installer/izpack-8.1/src-modifications added to the repository

[Tolven-cvs-commit] tolven/installer/template - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/template

Log Message:
Directory /cvsroot/tolven/tolven/installer/template added to the repository

[Tolven-cvs-commit] tolven/installer - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer

Log Message:
Directory /cvsroot/tolven/tolven/installer added to the repository

[Tolven-cvs-commit] tolven/installer/util - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/util
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/util

Log Message:
Directory /cvsroot/tolven/tolven/installer/util added to the repository

[Tolven-cvs-commit] tolven/installer/apache-ant-1.6.5 - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/apache-ant-1.6.5
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/apache-ant-1.6.5

Log Message:
Directory /cvsroot/tolven/tolven/installer/apache-ant-1.6.5 added to the repository

[Tolven-cvs-commit] tolven/installer/izpack-8.1 - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/izpack-8.1
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/izpack-8.1

Log Message:
Directory /cvsroot/tolven/tolven/installer/izpack-8.1 added to the repository

[Tolven-cvs-commit] tolven/installer/apache-ant-1.6.5/lib - New directory

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/installer/apache-ant-1.6.5/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27928/installer/apache-ant-1.6.5/lib

Log Message:
Directory /cvsroot/tolven/tolven/installer/apache-ant-1.6.5/lib added to the repository

[Tolven-cvs-commit] tolven/security-config build.xml,1.46,1.47

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/security-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17009/security-config

Modified Files:
	build.xml 
Log Message:
Fixed the missing pg client certs issue, so that when tolven.stage.use-existing-cert=true and the user's home directory has no pg-client to use, then new ones are first generated, and then used from then on.

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** build.xml	25 Sep 2006 08:59:09 -0000	1.46
--- build.xml	28 Sep 2006 04:05:34 -0000	1.47
***************
*** 184,188 ****
  		  </condition>
  		<condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore">
! 			<equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" />
  		  </condition>
  		<antcall target="${db-client-target}" />
--- 184,191 ----
  		  </condition>
  		<condition property="db-client-target" value="add-current-client-postgres-to-db-truststore" else="create-tolvendev-client-cert-for-db-truststore">
! 			<and>
! 				<equals arg1="${tolven.stage.use-existing-pg-client-cert}" arg2="true" casesensitive="false" />
! 				<available file="${postgres-client-cert-dir}/postgresql.crt" />
! 			</and>
  		  </condition>
  		<antcall target="${db-client-target}" />

[Tolven-cvs-commit] tolven build.xml,1.60,1.61

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11803

Modified Files:
	build.xml 
Log Message:
Now able to initialize a local ldap on windows or unix and a remote ldap on unix

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/build.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** build.xml	25 Sep 2006 08:59:09 -0000	1.60
--- build.xml	27 Sep 2006 05:51:46 -0000	1.61
***************
*** 236,246 ****
  
  	<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:"
--- 236,263 ----
  
  	<target name="ldapInit" description="Initialize a Tolven-specific LDAP server">
+ 		<fail unless="ldap.location.browsable" />
+ 		<condition property="ldapInit-target" value="ldapInit-local" else="ldapInit-remote-unix">
+ 			<equals arg1="${ldap.location.browsable}" arg2="true" casesensitive="false" />
+ 		</condition>
+ 		<antcall target="${ldapInit-target}" />
+ 	</target>
+ 
+ 	<target name="ldapInit-local" description="Initialize a Tolven-specific LDAP server">
  		<echo level="info" message="For this task to work correctly, SLAPD must not be running"/>
! 		<condition property="ldap-command" value="${ldap.location}/slapadd.exe" else="slapadd">
! 			<os family="windows"/>
! 		</condition>
! 		<exec dir="${ldap.location}" executable="${ldap-command}">
  			<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="ldapInit-remote-unix" description="Initialize a Tolven-specific LDAP remote unix server">
! 		<echo level="info" message="For this task to work correctly, SLAPD must not be running"/>
! 		<sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} &amp;&amp; slapadd -v -l tolveninitial.ldif -f slapd.conf" password="${tolven.ldap.host.password}" trust="true" failonerror="true" />
! 		<echo level="info" message="You can start the LDAP server (SLAPD) now"/>
! 	</target>
! 
      <target name="databaseInit">
      	<input message="Please enter db-password:"

[Tolven-cvs-commit] tolven build.xml,1.59,1.60

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4968

Modified Files:
	build.xml 
Log Message:
Credential permissions should now be set automatically during a deployment.

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** build.xml	23 Sep 2006 21:04:20 -0000	1.59
--- build.xml	25 Sep 2006 08:59:09 -0000	1.60
***************
*** 78,81 ****
--- 78,82 ----
  		<filter token="ldap.java.naming.provider.url" value="${ldap.java.naming.provider.url}"/>
  		<filter token="tolven-jdbc-url" value="${jdbc.url}"/>
+ 		<filter token="ldap-location" value="${ldap.location}"/>
  		<filter token="hashed-ldapserver-password" value="${hashed-ldapserver.password}"/>
  		<filter token="hashed-pgserver-password" value="${hashed-pgserver.password}"/>
***************
*** 87,90 ****
--- 88,92 ----
  			<fileset dir="ldap-config/">
  				<include name="slapd.conf"/>
+ 				<include name="slapd_linux.conf"/>
  			</fileset>
      	</copy>
***************
*** 145,155 ****
  				<include name="tolvendev-ldap-key.pem" />
  				<include name="tolvendev-ldap-cacerts.pem" />
- 				<include name="slapd.conf"/>
  				<include name="tolveninitial.ldif"/>
  			</fileset>
      	</copy>
          <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" />
      </target>
  
  	<target name="deploy-db-from-stage">
          <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-db-credentials" />
--- 147,172 ----
  				<include name="tolvendev-ldap-key.pem" />
  				<include name="tolvendev-ldap-cacerts.pem" />
  				<include name="tolveninitial.ldif"/>
  			</fileset>
      	</copy>
+ 		<condition property="deploy-ldap-from-stage-target" value="deploy-ldap-slapd-conf-windows-from-stage" else="deploy-ldap-slapd-conf-linux-from-stage">
+ 			<os family="windows"/>
+ 		  </condition>
+         <antcall target="${deploy-ldap-from-stage-target}" />
          <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-ldap-credentials" />
      </target>
  
+ 	<target name="deploy-ldap-slapd-conf-windows-from-stage">
+     	<copy toDir="${ldap.location}" overwrite="true" preservelastmodified="true" filtering="true" verbose="${message.show.copy}">
+ 			<fileset dir="${tolven.stage}/ldap-deploy-location">
+ 				<include name="slapd.conf"/>
+ 			</fileset>
+     	</copy>
+     </target>
+ 
+ 	<target name="deploy-ldap-slapd-conf-linux-from-stage">
+ 		<copy file="${tolven.stage}/ldap-deploy-location/slapd_linux.conf" tofile="${ldap.location}/slapd.conf" />
+     </target>
+ 
  	<target name="deploy-db-from-stage">
          <ant dir="${tolven.location}/security-config" antfile="${tolven.location}/security-config/build.xml" target="deploy-db-credentials" />

[Tolven-cvs-commit] tolven/security-config build.xml,1.45,1.46

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/security-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4968/security-config

Modified Files:
	build.xml 
Log Message:
Credential permissions should now be set automatically during a deployment.

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** build.xml	24 Sep 2006 04:42:42 -0000	1.45
--- build.xml	25 Sep 2006 08:59:09 -0000	1.46
***************
*** 534,537 ****
--- 534,557 ----
  			</fileset>
      	</copy>
+ 		<condition property="deploy-certs-to-localhost-ldap-target" value="fix-permissions-localhost-ldap-windows" else="fix-permissions-localhost-ldap-unix">
+ 			<os family="windows"/>
+ 		</condition>
+ 		<antcall target="${deploy-certs-to-localhost-ldap-target}" />
+ 	</target>
+ 
+ 	<target name="fix-permissions-localhost-ldap-windows" description="Fix certificate permissions LDAP on windows">
+ 		<exec dir="${ldap.location}" executable="cacls" failonerror="true">
+ 			<arg line="*.pem /E /R Users" />
+ 		</exec>
+ 	</target>
+ 
+ 	<target name="fix-permissions-localhost-ldap-unix" description="Fix certificate permissions LDAP on unix">
+ 		<chmod perm="600">
+ 			<fileset dir="${ldap.location}">
+ 				<include name="tolvendev-ldap-cert.pem"/>
+ 				<include name="tolvendev-ldap-key.pem"/>
+ 				<include name="tolvendev-ldap-cacerts.pem"/>
+ 			</fileset>
+ 		</chmod>
  	</target>
  
***************
*** 560,563 ****
--- 580,615 ----
  			</fileset>
      	</copy>
+ 		<condition property="deploy-certs-to-localhost-pg-target" value="fix-permissions-localhost-pg-windows" else="fix-permissions-localhost-pg-unix">
+ 			<os family="windows"/>
+ 		</condition>
+ 		<antcall target="${deploy-certs-to-localhost-pg-target}" />
+ 	</target>
+ 
+ 	<target name="fix-permissions-localhost-pg-windows" description="Fix certificate permissions Postgresql on windows">
+ 		<exec dir="${postgres.location}/data" executable="cacls" inputstring="Y|" failonerror="true">
+ 			<arg line="server.crt /E /R Users" />
+ 		</exec>
+ 		<exec dir="${postgres.location}/data" executable="cacls" inputstring="Y|" failonerror="true">
+ 			<arg line="server.key /E /R Users" />
+ 		</exec>
+ 		<exec dir="${postgres.location}/data" executable="cacls" inputstring="Y|" failonerror="true">
+ 			<arg line="root.crt /E /R Users" />
+ 		</exec>
+ 	</target>
+ 
+ 	<target name="fix-permissions-localhost-pg-unix" description="Fix certificate permissions Postgresql on unix">
+ 		<chmod perm="600">
+ 			<fileset dir="${postgres.location}/data">
+ 				<include name="server.crt" />
+ 				<include name="server.key" />
+ 				<include name="root.crt" />
+ 			</fileset>
+ 		</chmod>
+ 		<exec dir="${postgres.location}" executable="chown" failonerror="true">
+ 			<arg line="${postgres.host.user}:${postgres.host.user}" />
+ 			<arg line="data/server.crt" />
+ 			<arg line="data/server.key" />
+ 			<arg line="data/root.crt" />
+ 		</exec>
  	</target>
  

[Tolven-cvs-commit] tolven/ldap-config slapd_linux.conf,NONE,1.1

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/ldap-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15471/ldap-config

Added Files:
	slapd_linux.conf 
Log Message:
Added the linux format of the slapd.conf

--- NEW FILE: slapd_linux.conf ---
#
# See slapd.conf(5) for details on configuration options.
# This file should NOT be world readable.
#
include		./schema/core.schema
include		./schema/cosine.schema
include		./schema/inetorgperson.schema
include		./schema/nis.schema

# Allow LDAPv2 client connections.  This is NOT the default.
allow bind_v2

# Do not enable referrals until AFTER you have a working directory
# service AND an understanding of referrals.
#referral	ldap://root.openldap.org

pidfile		/var/run/openldap/slapd.pid
argsfile	/var/run/openldap/slapd.args

# Load dynamic backend modules:
# modulepath	/usr/lib/openldap
# moduleload	back_bdb.la
# moduleload	back_ldap.la
# moduleload	back_ldbm.la
# moduleload	back_passwd.la
# moduleload	back_shell.la

# The next three lines allow use of TLS for encrypting connections using a
# dummy test certificate which you can generate by changing to
# /etc/pki/tls/certs, running "make slapd.pem", and fixing permissions on
# slapd.pem so that the ldap user or group can read it.  Your client software
# may balk at self-signed certificates, however.

TLSCipherSuite          HIGH:MEDIUM:+SSLv2
TLSCACertificateFile ./tolvendev-ldap-cacerts.pem
TLSCertificateFile ./tolvendev-ldap-cert.pem
TLSCertificateKeyFile ./tolvendev-ldap-key.pem

# Sample security restrictions
#	Require integrity protection (prevent hijacking)
#	Require 112-bit (3DES or better) encryption for updates
#	Require 63-bit encryption for simple bind
# security ssf=1 update_ssf=112 simple_bind=64

# Sample access control policy:
#	Root DSE: allow anyone to read it
#	Subschema (sub)entry DSE: allow anyone to read it
#	Other DSEs:
#		Allow self write access
#		Allow authenticated users read access
#		Allow anonymous users to authenticate
#	Directives needed to implement policy:
# access to dn.base="" by * read
# access to dn.base="cn=Subschema" by * read
# access to *
#	by self write
#	by users read
#	by anonymous auth
#
# if no access controls are present, the default policy
# allows anyone and everyone to read anything but restricts
# updates to rootdn.  (e.g., "access to * by * read")
#
rootdn cn=Manager,dc=tolven,dc=com

#######################################################################
# ldbm and/or bdb database definitions
#######################################################################

database	bdb
suffix		"dc=tolven,dc=com"
rootdn		"cn=Manager,dc=tolven,dc=com"
# Cleartext passwords, especially for the rootdn, should
# be avoided.  See slappasswd(8) and slapd.conf(5) for details.
# Use of strong authentication encouraged.
rootpw		@slapd-conf-rootpw@
# rootpw		{crypt}ijFYNcSNctBYg

# The database directory MUST exist prior to running slapd AND 
# should only be accessible by the slapd and slap tools.
# Mode 700 recommended.
directory	./tolvendata

# Indices to maintain for this database
index objectClass                       eq,pres
index ou,cn,mail,surname,givenname      eq,pres,sub
index uidNumber,gidNumber,loginShell    eq,pres
index uid,memberUid                     eq,pres,sub
index nisMapName,nisMapEntry            eq,pres,sub

# Replicas of this database
#replogfile /var/lib/ldap/openldap-master-replog
#replica host=ldap-1.example.com:389 starttls=critical
#     bindmethod=sasl saslmech=GSSAPI
#     authcId=host/lda...@EX...

[Tolven-cvs-commit] tolven/security-config build.xml,1.44,1.45

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/security-config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7466/security-config

Modified Files:
	build.xml 
Log Message:
For remote linux OS, fix the permissions of certificates using chmod 600

Index: build.xml
===================================================================
RCS file: /cvsroot/tolven/tolven/security-config/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** build.xml	23 Sep 2006 22:19:16 -0000	1.44
--- build.xml	24 Sep 2006 04:42:42 -0000	1.45
***************
*** 548,551 ****
--- 548,552 ----
  			</fileset>
      	</scp>
+ 		<sshexec host="${ldap.host}" username="${ldap.host.user}" command="cd ${ldap.location} &amp;&amp; chmod 600 *.pem" password="${tolven.ldap.host.password}" trust="true" failonerror="true" />
  		<echo level="info" message="tolvendev-ldap-cert.pem, tolvendev-ldap-key.pem and tolvendev-ldap-cacerts.pem have been copied to ${ldap.host.user}@${ldap.host}:${ldap.location}" />
  	</target>
***************
*** 573,576 ****
--- 574,578 ----
  			</fileset>
      	</scp>
+ 		<sshexec host="${jdbc.host}" username="${postgres.host.user}" command="cd ${postgres.location}/data &amp;&amp; chmod 600 *.crt *.key" password="${tolven.pg.host.password}" trust="true" failonerror="true" />
  		<echo level="info" message="server.crt, server.key and root.crt have been copied to ${postgres.host.user}@${jdbc.host}:${postgres.location}/data" />
  	</target>

[Tolven-cvs-commit] tolven/template ant-build.template,1.45,1.46

[Joseph I. <jos...@us...>]

Update of /cvsroot/tolven/tolven/template
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16486/template

Modified Files:
	ant-build.template 
Log Message:
The location browsable flags are used to distinguish between copying credentials to a location which is local (using std copy) or remote (using scp)

Index: ant-build.template
===================================================================
RCS file: /cvsroot/tolven/tolven/template/ant-build.template,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ant-build.template	5 Sep 2006 04:06:39 -0000	1.45
--- ant-build.template	23 Sep 2006 22:19:16 -0000	1.46
***************
*** 3,8 ****
--- 3,11 ----
  # Location for components used by Tolven
  ldap.location=c:/OpenLDAP
+ # the location browsable flags are used to distinguish between copying credentials to a location which is local (using std copy) or remote (using scp)
+ ldap.location.browsable=true
  ldap.host=localhost
  postgres.location=c:/postgreSQL/8.1/
+ postgres.location.browsable=true
  java.home=c:/jdk1.5.0_06
  jboss.location=${tolven.home}/tolven-jboss-4.0.4.GA