Scarab commit: svn commit: r10146 - trunk: . build src/conf/conf www/book xdocs xdocs/howto
[email protected] 5 Jun 2006 20:53:06 -0000
Newsgroups
gmane.comp.java.scarab.cvs
Message-ID
<[email protected] >
Author: dabbous
Date: 2006-06-05 13:53:06-0700
New Revision: 10146
Modified:
trunk/build/build.xml
trunk/project.properties
trunk/src/conf/conf/build.xml
trunk/wizzard.properties
trunk/www/book/install-en.xml
trunk/www/book/install-fr.xml
trunk/xdocs/howto/build-howto.xml
trunk/xdocs/scarab_properties.xml
Log:
SCB1717 fixed:
"ant compile" (the default target) no more copies any database driver to the WEB-INF/lib directory.
"ant create-db" copies exactly the necessary drivers to the WEB-INF/lib directory.
The driver-template to be used for finding the relevant driver-file(s) is
now named "scarab.database.jdbc.driver.jar" which as in compliance with the
name convention "scarab.database..." for database relevant properties.
Also fixed the documentation and the scarab properties files.
Modified: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10146&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10145&r2=10146
==============================================================================
--- trunk/build/build.xml (original)
+++ trunk/build/build.xml 2006-06-05 13:53:06-0700
@@ -144,6 +144,12 @@
<fileset dir="${repository.dir}">
<exclude name="**/servlet*.jar"/>
<exclude name="**/xalan*.jar"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.mysql}"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.postgres}"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.hypersonic}"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.mssql}"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.oracle}"/>
+ <exclude name="**/${scarab.database.jdbc.driver.jar.db2}"/>
<include name="**/**.jar"/>
</fileset>
</copy>
@@ -191,7 +197,7 @@
</echo>
<!-- ======================================= -->
- <!-- copy the webapplication framework -->
+ <echo> copy the webapplication framework ... </echo>
<!-- ======================================= -->
<copy todir="${build.project}" filtering="no">
<fileset dir="${src.dir}/webapp">
@@ -209,7 +215,7 @@
<!-- ======================================= -->
- <!-- copy the base configuration files -->
+ <echo> copy the base configuration files ... </echo>
<!-- ======================================= -->
<copy todir="${build.project.webinf}/conf" filtering="no">
<fileset dir="${src.dir}/conf/conf">
@@ -223,7 +229,7 @@
</copy>
<!-- ==================================== -->
- <!-- copy the database source files -->
+ <echo> copy the database source files </echo>
<!-- ==================================== -->
<copy todir="${build.project}/database/src" filtering="no">
<fileset dir="${src.dir}">
@@ -234,10 +240,24 @@
<include name="torque.static.props"/>
</fileset>
</copy>
+
+ <!-- ==================================== -->
+ <echo> copy the database drivers ... </echo>
+ <!-- ==================================== -->
+ <copy todir="${build.project}/database/src/drivers" filtering="no">
+ <fileset dir="${repository.dir}">
+ <include name="**/${scarab.database.jdbc.driver.jar.mysql}"/>
+ <include name="**/${scarab.database.jdbc.driver.jar.postgres}"/>
+ <include name="**/${scarab.database.jdbc.driver.jar.hypersonic}"/>
+ <include name="**/${scarab.database.jdbc.driver.jar.mssql}"/>
+ <include name="**/${scarab.database.jdbc.driver.jar.oracle}"/>
+ <include name="**/${scarab.database.jdbc.driver.jar.db2}"/>
+ </fileset>
+ </copy>
<!-- ======================================== -->
- <!-- Ensure, that the custom.properties exist -->
- <!-- possibly creates an empty file -->
+ <echo> Ensure, that the custom.properties exist </echo>
+ <!-- possibly creates an empty file -->
<!-- ======================================== -->
<touch file="${build.project.webinf}/conf/custom.properties"/>
Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&rev=10146&p1=trunk/project.properties&p2=trunk/project.properties&r1=10145&r2=10146
==============================================================================
--- trunk/project.properties (original)
+++ trunk/project.properties 2006-06-05 13:53:06-0700
@@ -1315,7 +1315,7 @@
# scarab.test.database.url.mysql
# scarab.test.database.username.mysql
# scarab.test.database.password.mysql
-# scarab.jdbc.driver.jar.mysql
+# scarab.database.jdbc.driver.jar.mysql
#
# Default settings for MySQL
#
@@ -1344,7 +1344,7 @@
scarab.test.database.url.mysql=${jdbc}:mysql://${scarab.database.host}:${scarab.database.port}/${scarab.test.database.name}
scarab.test.database.username.mysql=${scarab.database.username}
scarab.test.database.password.mysql=${scarab.database.password}
-scarab.jdbc.driver.jar.mysql=mm.mysql-*.jar
+scarab.database.jdbc.driver.jar.mysql=mysql-*.jar
# ==================
# End of Group MySQL
@@ -1370,7 +1370,7 @@
# scarab.test.database.url.postgresql
# scarab.test.database.username.postgresql
# scarab.test.database.password.postgresql
-# scarab.jdbc.driver.jar.postgres
+# scarab.database.jdbc.driver.jar.postgres
#
# Default settings for Postgres
#
@@ -1390,7 +1390,7 @@
scarab.test.database.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}
scarab.test.database.username.postgresql=${scarab.database.username}
scarab.test.database.password.postgresql=${scarab.database.password}
-scarab.jdbc.driver.jar.postgres=postgresql-*.jar
+scarab.database.jdbc.driver.jar.postgres=postgresql-*.jar
# =====================
# End of Group postgres
@@ -1418,7 +1418,7 @@
# scarab.test.database.url.hypersonic
# scarab.test.database.username.hypersonic
# scarab.test.database.password.hypersonic
-# scarab.jdbc.driver.jar.hypersonic
+# scarab.database.jdbc.driver.jar.hypersonic
#
# Default settings for hypersonic
#
@@ -1440,7 +1440,7 @@
scarab.test.database.url.hypersonic=${jdbc}:hsqldb:.
scarab.test.database.username.hypersonic=${scarab.database.username}
scarab.test.database.password.hypersonic=${scarab.database.password}
-scarab.jdbc.driver.jar.hypersonic=hsqldb*.jar
+scarab.database.jdbc.driver.jar.hypersonic=hsqldb*.jar
# =======================
# End of Group hypersonic
@@ -1466,7 +1466,7 @@
# scarab.test.database.url.mssql
# scarab.test.database.username.mssql
# scarab.test.database.password.mssql
-# scarab.jdbc.driver.jar.mssql
+# scarab.database.jdbc.driver.jar.mssql
# scarab.database.manual.creation.mssql
#
# Default settings for mssql
@@ -1487,7 +1487,7 @@
scarab.test.database.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.test.database.name};SelectMethod=cursor
scarab.test.database.username.mssql=${scarab.database.username}
scarab.test.database.password.mssql=${scarab.database.password}
-scarab.jdbc.driver.jar.mssql=ms*.jar
+scarab.database.jdbc.driver.jar.mssql=ms*.jar
scarab.database.manual.creation.mssql=true
# ==================
@@ -1514,7 +1514,7 @@
# scarab.test.database.url.oracle
# scarab.test.database.username.oracle
# scarab.test.database.password.oracle
-# scarab.jdbc.driver.jar.oracle
+# scarab.database.jdbc.driver.jar.oracle
#
# Default settings for oracle
#
@@ -1534,7 +1534,7 @@
scarab.test.database.url.oracle=
scarab.test.database.username.oracle=${scarab.database.username}
scarab.test.database.password.oracle=${scarab.database.password}
-scarab.jdbc.driver.jar.oracle=oracle-*.jar
+scarab.database.jdbc.driver.jar.oracle=oracle-*.jar
# ===================
# End of Group oracle
@@ -1560,7 +1560,7 @@
# scarab.test.database.url.db2
# scarab.test.database.username.db2
# scarab.test.database.password.db2
-# scarab.jdbc.driver.jar.db2
+# scarab.database.jdbc.driver.jar.db2
#
# Default settings for db2
#
@@ -1580,7 +1580,7 @@
scarab.test.database.url.db2=jdbc:db2:${scarab.test.database.name}
scarab.test.database.username.db2=${scarab.database.username}
scarab.test.database.password.db2=${scarab.database.password}
-scarab.jdbc.driver.jar.db2=db2java.zip
+scarab.database.jdbc.driver.jar.db2=db2java.zip
# ================
# End of Group db2
Modified: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=diff&rev=10146&p1=trunk/src/conf/conf/build.xml&p2=trunk/src/conf/conf/build.xml&r1=10145&r2=10146
==============================================================================
--- trunk/src/conf/conf/build.xml (original)
+++ trunk/src/conf/conf/build.xml 2006-06-05 13:53:06-0700
@@ -353,7 +353,24 @@
<!-- ================================================================== -->
<!-- Load default data -->
<!-- ================================================================== -->
- <target name="load-default-data" depends="create-db-schema,create-empty-db">
+ <target name="load-drivers" depends="">
+ <!-- ============================================================== -->
+ <echo> copy the database drivers for ${scarab.database.type} ... </echo>
+ <echo> sourcedir : ${database.src.dir}/drivers </echo>
+ <echo> targetdir : ${webapp.lib.dir} </echo>
+ <echo> driver template : **/${scarab.database.jdbc.driver.jar} </echo>
+ <!-- ============================================================== -->
+ <copy todir="${webapp.lib.dir}" filtering="no" flatten="true">
+ <fileset dir="${database.src.dir}/drivers">
+ <include name="**/${scarab.database.jdbc.driver.jar}"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Load default data -->
+ <!-- ================================================================== -->
+ <target name="load-default-data" depends="load-drivers, create-db-schema,create-empty-db">
<!-- Oracle does not have any type of conditional execution -->
<!-- of "drop table". So when running the table creation, -->
Modified: trunk/wizzard.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/wizzard.properties?view=diff&rev=10146&p1=trunk/wizzard.properties&p2=trunk/wizzard.properties&r1=10145&r2=10146
==============================================================================
--- trunk/wizzard.properties (original)
+++ trunk/wizzard.properties 2006-06-05 13:53:06-0700
@@ -1,369 +1,369 @@
-#######################################################################
-#
-# _________ B U I L D S Y S T E M ___.
-# / _____/ ____ _____ ____________ \_ |__
-# \_____ \_/ ___\\__ \\_ __ \__ \ | __ \
-# / \ \___ / __ \| | \// __ \| \_\ \
-# /_______ /\___ >____ /__| (____ /___ /
-# \/ \/ \/ \/ \/
-#
-# ----------------------------------------------
-# M I N I M A L - P R O P E R T Y S E T
-# ----------------------------------------------
-#
-# >>>> CAUTION: DO NOT MODIFY THIS FILE. <<<<
-#
-# Note for developers:
-# NEVER change this file by hand! If you want to introduce a new property,
-# please update
-#
-# xdocs/scarab_properties.xml
-#
-# instead and afterwards call
-#
-# maven scarab:update-properties
-#
-# Now the files project.properties, wizzard.properties and minimal.properties
-# have been regenerated.
-#
-#
-# This file contains the minimal set of properties which MUST
-# be configured according to your individual environment.
-# As starting point you can copy one of the two files below to
-# your individual $SCARAB_ROOT/build.properties file:
-#
-# minimal.properties this file (minimal modification set)
-# project.properties (full modification set)
-#
-# Using the minimal.properties as a starting point makes life
-# much easier for "first time administration".
-#
-# Please refer to the file
-#
-# project.properties
-#
-# for more specific informations about the full available set
-# of properties.
-#
-# QUICK instruction:
-# ==================
-# Step 1: Choose your database type and ensure your database environment
-# is fully installed and available. Then browse through this file
-# and search for the property "scarab.database.type". Replace the
-# default value ("mysql") by the database type of your choice.
-# If your database choice is already "mysql" just skip this first step.
-#
-# Step 2: Browse again through this file and adjust all other properties
-# to your adjust individual setup.
-#
-#######################################################################
-
-# ----
-# jdbc
-# ----
-#
-#
-# nasty trick. used for the SetupWizard only
-# quick explanation: The setup Wizzard does not resolve values
-# starting with "${" .
-# This is intended so that we can use the
-# ${} notation also in the wizzard properties.
-# So if we want to keep the dynamic character
-# of the variable, it must start with "${" .
-# Otherwise it would be fully resolved.
-# See the property [scarab.database.url.mysql]
-# below to see what i mean [HD].
-#
-
-jdbc=jdbc
-
-
-# ============
-# Group: MySQL
-# ============
-#
-# scarab.jdbc.handler.mysql
-# scarab.database.port.mysql
-# scarab.database.admin.url.mysql
-# scarab.database.url.mysql
-# scarab.database.url.extension.mysql
-# scarab.database.pool.validationQuery.mysql
-# scarab.database.jdbc.driver.mysql
-# scarab.database.admin.username.mysql
-# scarab.database.admin.password.mysql
-# scarab.database.username.mysql
-# scarab.database.password.mysql
-# scarab.test.database.name.mysql
-# scarab.test.database.url.mysql
-# scarab.test.database.username.mysql
-# scarab.test.database.password.mysql
-# scarab.jdbc.driver.jar.mysql
-#
-# Default settings for MySQL
-#
-
-scarab.jdbc.handler.mysql=mysql
-scarab.database.port.mysql=3306
-scarab.database.admin.url.mysql=${jdbc}:${scarab.jdbc.handler}://${scarab.database.host}:${scarab.database.port}/?
-scarab.database.url.mysql=${jdbc}:${scarab.jdbc.handler}://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}?${scarab.database.url.extension}
-
-# -----------------------------------
-# scarab.database.url.extension.mysql
-# -----------------------------------
-#
-#
-# scarab.database.url.extension.mysql = useUnicode=true&characterEncoding=utf8
-#
-
-scarab.database.url.extension.mysql=
-scarab.database.pool.validationQuery.mysql=SELECT 1
-scarab.database.jdbc.driver.mysql=org.gjt.mm.mysql.Driver
-scarab.database.admin.username.mysql=root
-scarab.database.admin.password.mysql=
-scarab.database.username.mysql=root
-scarab.database.password.mysql=
-scarab.test.database.name.mysql=${scarab.database.name}
-scarab.test.database.url.mysql=${jdbc}:mysql://${scarab.database.host}:${scarab.database.port}/${scarab.test.database.name}
-scarab.test.database.username.mysql=${scarab.database.username}
-scarab.test.database.password.mysql=${scarab.database.password}
-scarab.jdbc.driver.jar.mysql=mm.mysql-*.jar
-
-# ==================
-# End of Group MySQL
-# ==================
-
-
-# ===============
-# Group: postgres
-# ===============
-#
-# scarab.jdbc.handler.postgresql
-# scarab.database.port.postgresql
-# scarab.database.admin.url.postgresql
-# scarab.database.url.postgresql
-# scarab.database.url.extension.postgresql
-# scarab.database.pool.validationQuery.postgresql
-# scarab.database.jdbc.driver.postgresql
-# scarab.database.admin.username.postgresql
-# scarab.database.admin.password.postgresql
-# scarab.database.username.postgresql
-# scarab.database.password.postgresql
-# scarab.test.database.name.postgresql
-# scarab.test.database.url.postgresql
-# scarab.test.database.username.postgresql
-# scarab.test.database.password.postgresql
-# scarab.jdbc.driver.jar.postgres
-#
-# Default settings for Postgres
-#
-
-scarab.jdbc.handler.postgresql=postgres
-scarab.database.port.postgresql=5432
-scarab.database.admin.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/template1
-scarab.database.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}
-scarab.database.url.extension.postgresql=
-scarab.database.pool.validationQuery.postgresql=SELECT 1
-scarab.database.jdbc.driver.postgresql=org.postgresql.Driver
-scarab.database.admin.username.postgresql=postgres
-scarab.database.admin.password.postgresql=
-scarab.database.username.postgresql=sa
-scarab.database.password.postgresql=
-scarab.test.database.name.postgresql=${scarab.database.name}
-scarab.test.database.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}
-scarab.test.database.username.postgresql=${scarab.database.username}
-scarab.test.database.password.postgresql=${scarab.database.password}
-scarab.jdbc.driver.jar.postgres=postgresql-*.jar
-
-# =====================
-# End of Group postgres
-# =====================
-
-
-# =================
-# Group: hypersonic
-# =================
-#
-# hsqldb.database
-# hsqldb.dbname
-# scarab.jdbc.handler.hypersonic
-# scarab.database.port.hypersonic
-# scarab.database.admin.url.hypersonic
-# scarab.database.url.hypersonic
-# scarab.database.url.extension.hypersonic
-# scarab.database.pool.validationQuery.hypersonic
-# scarab.database.jdbc.driver.hypersonic
-# scarab.database.admin.username.hypersonic
-# scarab.database.admin.password.hypersonic
-# scarab.database.username.hypersonic
-# scarab.database.password.hypersonic
-# scarab.test.database.name.hypersonic
-# scarab.test.database.url.hypersonic
-# scarab.test.database.username.hypersonic
-# scarab.test.database.password.hypersonic
-# scarab.jdbc.driver.jar.hypersonic
-#
-# Default settings for hypersonic
-#
-
-hsqldb.database=hsqldb
-hsqldb.dbname=${scarab.database.name}
-scarab.jdbc.handler.hypersonic=hsqldb
-scarab.database.port.hypersonic=3306
-scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname}
-scarab.database.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname}
-scarab.database.url.extension.hypersonic=
-scarab.database.pool.validationQuery.hypersonic=SELECT ATTRIBUTE_ID FROM SCARAB_ATTRIBUTE WHERE ATTRIBUTE_ID='0'
-scarab.database.jdbc.driver.hypersonic=org.hsqldb.jdbcDriver
-scarab.database.admin.username.hypersonic=${scarab.database.username}
-scarab.database.admin.password.hypersonic=${scarab.database.password}
-scarab.database.username.hypersonic=sa
-scarab.database.password.hypersonic=
-scarab.test.database.name.hypersonic=${scarab.database.name}
-scarab.test.database.url.hypersonic=${jdbc}:hsqldb:.
-scarab.test.database.username.hypersonic=${scarab.database.username}
-scarab.test.database.password.hypersonic=${scarab.database.password}
-scarab.jdbc.driver.jar.hypersonic=hsqldb*.jar
-
-# =======================
-# End of Group hypersonic
-# =======================
-
-
-# ============
-# Group: mssql
-# ============
-#
-# scarab.jdbc.handler.mssql
-# scarab.database.port.mssql
-# scarab.database.admin.url.mssql
-# scarab.database.url.mssql
-# scarab.database.url.extension.mssql
-# scarab.database.pool.validationQuery.mssql
-# scarab.database.jdbc.driver.mssql
-# scarab.database.admin.username.mssql
-# scarab.database.admin.password.mssql
-# scarab.database.username.mssql
-# scarab.database.password.mssql
-# scarab.test.database.name.mssql
-# scarab.test.database.url.mssql
-# scarab.test.database.username.mssql
-# scarab.test.database.password.mssql
-# scarab.jdbc.driver.jar.mssql
-# scarab.database.manual.creation.mssql
-#
-# Default settings for mssql
-#
-
-scarab.jdbc.handler.mssql=mssql
-scarab.database.port.mssql=1433
-scarab.database.admin.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.database.name};SelectMethod=cursor
-scarab.database.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.database.name};SelectMethod=cursor
-scarab.database.url.extension.mssql=
-scarab.database.pool.validationQuery.mssql=SELECT 1
-scarab.database.jdbc.driver.mssql=com.microsoft.jdbc.sqlserver.SQLServerDriver
-scarab.database.admin.username.mssql=${scarab.database.username}
-scarab.database.admin.password.mssql=${scarab.database.password}
-scarab.database.username.mssql=sa
-scarab.database.password.mssql=
-scarab.test.database.name.mssql=${scarab.database.name}
-scarab.test.database.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.test.database.name};SelectMethod=cursor
-scarab.test.database.username.mssql=${scarab.database.username}
-scarab.test.database.password.mssql=${scarab.database.password}
-scarab.jdbc.driver.jar.mssql=ms*.jar
-scarab.database.manual.creation.mssql=true
-
-# ==================
-# End of Group mssql
-# ==================
-
-
-# =============
-# Group: oracle
-# =============
-#
-# scarab.jdbc.handler.oracle
-# scarab.database.port.oracle
-# scarab.database.admin.url.oracle
-# scarab.database.url.oracle
-# scarab.database.url.extensionoracle
-# scarab.database.pool.validationQuery.oracle
-# scarab.database.jdbc.driver.oracle
-# scarab.database.admin.username.oracle
-# scarab.database.admin.password.oracle
-# scarab.database.username.oracle
-# scarab.database.password.oracle
-# scarab.test.database.name.oracle
-# scarab.test.database.url.oracle
-# scarab.test.database.username.oracle
-# scarab.test.database.password.oracle
-# scarab.jdbc.driver.jar.oracle
-#
-# Default settings for oracle
-#
-
-scarab.jdbc.handler.oracle=oracle
-scarab.database.port.oracle=
-scarab.database.admin.url.oracle=
-scarab.database.url.oracle=
-scarab.database.url.extensionoracle=
-scarab.database.pool.validationQuery.oracle=SELECT 1 FROM DUAL
-scarab.database.jdbc.driver.oracle=oracle.jdbc.driver.OracleDriver
-scarab.database.admin.username.oracle=${scarab.database.username}
-scarab.database.admin.password.oracle=${scarab.database.password}
-scarab.database.username.oracle=sa
-scarab.database.password.oracle=
-scarab.test.database.name.oracle=${scarab.database.name}
-scarab.test.database.url.oracle=
-scarab.test.database.username.oracle=${scarab.database.username}
-scarab.test.database.password.oracle=${scarab.database.password}
-scarab.jdbc.driver.jar.oracle=oracle-*.jar
-
-# ===================
-# End of Group oracle
-# ===================
-
-
-# ==========
-# Group: db2
-# ==========
-#
-# scarab.jdbc.handler.db2
-# scarab.database.port.db2
-# scarab.database.admin.url.db2
-# scarab.database.url.db2
-# scarab.database.url.extension.db2
-# scarab.database.pool.validationQuery.db2
-# scarab.database.jdbc.driver.db2
-# scarab.database.admin.username.db2
-# scarab.database.admin.password.db2
-# scarab.database.username.db2
-# scarab.database.password.db2
-# scarab.test.database.name.db2
-# scarab.test.database.url.db2
-# scarab.test.database.username.db2
-# scarab.test.database.password.db2
-# scarab.jdbc.driver.jar.db2
-#
-# Default settings for db2
-#
-
-scarab.jdbc.handler.db2=db2
-scarab.database.port.db2=
-scarab.database.admin.url.db2=jdbc:db2:${scarab.database.name}
-scarab.database.url.db2=jdbc:db2:${scarab.database.name}
-scarab.database.url.extension.db2=
-scarab.database.pool.validationQuery.db2=SELECT 1 FROM SYSIBM.SYSDUMMY1
-scarab.database.jdbc.driver.db2=COM.ibm.db2.jdbc.app.DB2Driver
-scarab.database.admin.username.db2=${scarab.database.username}
-scarab.database.admin.password.db2=${scarab.database.password}
-scarab.database.username.db2=sa
-scarab.database.password.db2=
-scarab.test.database.name.db2=${scarab.database.name}
-scarab.test.database.url.db2=jdbc:db2:${scarab.test.database.name}
-scarab.test.database.username.db2=${scarab.database.username}
-scarab.test.database.password.db2=${scarab.database.password}
-scarab.jdbc.driver.jar.db2=db2java.zip
-
-# ================
-# End of Group db2
+#######################################################################
+#
+# _________ B U I L D S Y S T E M ___.
+# / _____/ ____ _____ ____________ \_ |__
+# \_____ \_/ ___\\__ \\_ __ \__ \ | __ \
+# / \ \___ / __ \| | \// __ \| \_\ \
+# /_______ /\___ >____ /__| (____ /___ /
+# \/ \/ \/ \/ \/
+#
+# ----------------------------------------------
+# M I N I M A L - P R O P E R T Y S E T
+# ----------------------------------------------
+#
+# >>>> CAUTION: DO NOT MODIFY THIS FILE. <<<<
+#
+# Note for developers:
+# NEVER change this file by hand! If you want to introduce a new property,
+# please update
+#
+# xdocs/scarab_properties.xml
+#
+# instead and afterwards call
+#
+# maven scarab:update-properties
+#
+# Now the files project.properties, wizzard.properties and minimal.properties
+# have been regenerated.
+#
+#
+# This file contains the minimal set of properties which MUST
+# be configured according to your individual environment.
+# As starting point you can copy one of the two files below to
+# your individual $SCARAB_ROOT/build.properties file:
+#
+# minimal.properties this file (minimal modification set)
+# project.properties (full modification set)
+#
+# Using the minimal.properties as a starting point makes life
+# much easier for "first time administration".
+#
+# Please refer to the file
+#
+# project.properties
+#
+# for more specific informations about the full available set
+# of properties.
+#
+# QUICK instruction:
+# ==================
+# Step 1: Choose your database type and ensure your database environment
+# is fully installed and available. Then browse through this file
+# and search for the property "scarab.database.type". Replace the
+# default value ("mysql") by the database type of your choice.
+# If your database choice is already "mysql" just skip this first step.
+#
+# Step 2: Browse again through this file and adjust all other properties
+# to your adjust individual setup.
+#
+#######################################################################
+
+# ----
+# jdbc
+# ----
+#
+#
+# nasty trick. used for the SetupWizard only
+# quick explanation: The setup Wizzard does not resolve values
+# starting with "${" .
+# This is intended so that we can use the
+# ${} notation also in the wizzard properties.
+# So if we want to keep the dynamic character
+# of the variable, it must start with "${" .
+# Otherwise it would be fully resolved.
+# See the property [scarab.database.url.mysql]
+# below to see what i mean [HD].
+#
+
+jdbc=jdbc
+
+
+# ============
+# Group: MySQL
+# ============
+#
+# scarab.jdbc.handler.mysql
+# scarab.database.port.mysql
+# scarab.database.admin.url.mysql
+# scarab.database.url.mysql
+# scarab.database.url.extension.mysql
+# scarab.database.pool.validationQuery.mysql
+# scarab.database.jdbc.driver.mysql
+# scarab.database.admin.username.mysql
+# scarab.database.admin.password.mysql
+# scarab.database.username.mysql
+# scarab.database.password.mysql
+# scarab.test.database.name.mysql
+# scarab.test.database.url.mysql
+# scarab.test.database.username.mysql
+# scarab.test.database.password.mysql
+# scarab.database.jdbc.driver.jar.mysql
+#
+# Default settings for MySQL
+#
+
+scarab.jdbc.handler.mysql=mysql
+scarab.database.port.mysql=3306
+scarab.database.admin.url.mysql=${jdbc}:${scarab.jdbc.handler}://${scarab.database.host}:${scarab.database.port}/?
+scarab.database.url.mysql=${jdbc}:${scarab.jdbc.handler}://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}?${scarab.database.url.extension}
+
+# -----------------------------------
+# scarab.database.url.extension.mysql
+# -----------------------------------
+#
+#
+# scarab.database.url.extension.mysql = useUnicode=true&characterEncoding=utf8
+#
+
+scarab.database.url.extension.mysql=
+scarab.database.pool.validationQuery.mysql=SELECT 1
+scarab.database.jdbc.driver.mysql=org.gjt.mm.mysql.Driver
+scarab.database.admin.username.mysql=root
+scarab.database.admin.password.mysql=
+scarab.database.username.mysql=root
+scarab.database.password.mysql=
+scarab.test.database.name.mysql=${scarab.database.name}
+scarab.test.database.url.mysql=${jdbc}:mysql://${scarab.database.host}:${scarab.database.port}/${scarab.test.database.name}
+scarab.test.database.username.mysql=${scarab.database.username}
+scarab.test.database.password.mysql=${scarab.database.password}
+scarab.database.jdbc.driver.jar.mysql=mysql-*.jar
+
+# ==================
+# End of Group MySQL
+# ==================
+
+
+# ===============
+# Group: postgres
+# ===============
+#
+# scarab.jdbc.handler.postgresql
+# scarab.database.port.postgresql
+# scarab.database.admin.url.postgresql
+# scarab.database.url.postgresql
+# scarab.database.url.extension.postgresql
+# scarab.database.pool.validationQuery.postgresql
+# scarab.database.jdbc.driver.postgresql
+# scarab.database.admin.username.postgresql
+# scarab.database.admin.password.postgresql
+# scarab.database.username.postgresql
+# scarab.database.password.postgresql
+# scarab.test.database.name.postgresql
+# scarab.test.database.url.postgresql
+# scarab.test.database.username.postgresql
+# scarab.test.database.password.postgresql
+# scarab.database.jdbc.driver.jar.postgres
+#
+# Default settings for Postgres
+#
+
+scarab.jdbc.handler.postgresql=postgres
+scarab.database.port.postgresql=5432
+scarab.database.admin.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/template1
+scarab.database.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}
+scarab.database.url.extension.postgresql=
+scarab.database.pool.validationQuery.postgresql=SELECT 1
+scarab.database.jdbc.driver.postgresql=org.postgresql.Driver
+scarab.database.admin.username.postgresql=postgres
+scarab.database.admin.password.postgresql=
+scarab.database.username.postgresql=sa
+scarab.database.password.postgresql=
+scarab.test.database.name.postgresql=${scarab.database.name}
+scarab.test.database.url.postgresql=${jdbc}:postgresql://${scarab.database.host}:${scarab.database.port}/${scarab.database.name}
+scarab.test.database.username.postgresql=${scarab.database.username}
+scarab.test.database.password.postgresql=${scarab.database.password}
+scarab.database.jdbc.driver.jar.postgres=postgresql-*.jar
+
+# =====================
+# End of Group postgres
+# =====================
+
+
+# =================
+# Group: hypersonic
+# =================
+#
+# hsqldb.database
+# hsqldb.dbname
+# scarab.jdbc.handler.hypersonic
+# scarab.database.port.hypersonic
+# scarab.database.admin.url.hypersonic
+# scarab.database.url.hypersonic
+# scarab.database.url.extension.hypersonic
+# scarab.database.pool.validationQuery.hypersonic
+# scarab.database.jdbc.driver.hypersonic
+# scarab.database.admin.username.hypersonic
+# scarab.database.admin.password.hypersonic
+# scarab.database.username.hypersonic
+# scarab.database.password.hypersonic
+# scarab.test.database.name.hypersonic
+# scarab.test.database.url.hypersonic
+# scarab.test.database.username.hypersonic
+# scarab.test.database.password.hypersonic
+# scarab.database.jdbc.driver.jar.hypersonic
+#
+# Default settings for hypersonic
+#
+
+hsqldb.database=hsqldb
+hsqldb.dbname=${scarab.database.name}
+scarab.jdbc.handler.hypersonic=hsqldb
+scarab.database.port.hypersonic=3306
+scarab.database.admin.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname}
+scarab.database.url.hypersonic=jdbc:hsqldb:file:${applicationRoot}/${hsqldb.database}/${hsqldb.dbname}
+scarab.database.url.extension.hypersonic=
+scarab.database.pool.validationQuery.hypersonic=SELECT ATTRIBUTE_ID FROM SCARAB_ATTRIBUTE WHERE ATTRIBUTE_ID='0'
+scarab.database.jdbc.driver.hypersonic=org.hsqldb.jdbcDriver
+scarab.database.admin.username.hypersonic=${scarab.database.username}
+scarab.database.admin.password.hypersonic=${scarab.database.password}
+scarab.database.username.hypersonic=sa
+scarab.database.password.hypersonic=
+scarab.test.database.name.hypersonic=${scarab.database.name}
+scarab.test.database.url.hypersonic=${jdbc}:hsqldb:.
+scarab.test.database.username.hypersonic=${scarab.database.username}
+scarab.test.database.password.hypersonic=${scarab.database.password}
+scarab.database.jdbc.driver.jar.hypersonic=hsqldb*.jar
+
+# =======================
+# End of Group hypersonic
+# =======================
+
+
+# ============
+# Group: mssql
+# ============
+#
+# scarab.jdbc.handler.mssql
+# scarab.database.port.mssql
+# scarab.database.admin.url.mssql
+# scarab.database.url.mssql
+# scarab.database.url.extension.mssql
+# scarab.database.pool.validationQuery.mssql
+# scarab.database.jdbc.driver.mssql
+# scarab.database.admin.username.mssql
+# scarab.database.admin.password.mssql
+# scarab.database.username.mssql
+# scarab.database.password.mssql
+# scarab.test.database.name.mssql
+# scarab.test.database.url.mssql
+# scarab.test.database.username.mssql
+# scarab.test.database.password.mssql
+# scarab.database.jdbc.driver.jar.mssql
+# scarab.database.manual.creation.mssql
+#
+# Default settings for mssql
+#
+
+scarab.jdbc.handler.mssql=mssql
+scarab.database.port.mssql=1433
+scarab.database.admin.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.database.name};SelectMethod=cursor
+scarab.database.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.database.name};SelectMethod=cursor
+scarab.database.url.extension.mssql=
+scarab.database.pool.validationQuery.mssql=SELECT 1
+scarab.database.jdbc.driver.mssql=com.microsoft.jdbc.sqlserver.SQLServerDriver
+scarab.database.admin.username.mssql=${scarab.database.username}
+scarab.database.admin.password.mssql=${scarab.database.password}
+scarab.database.username.mssql=sa
+scarab.database.password.mssql=
+scarab.test.database.name.mssql=${scarab.database.name}
+scarab.test.database.url.mssql=${jdbc}:microsoft:sqlserver://${scarab.database.host}:${scarab.database.port};DatabaseName=${scarab.test.database.name};SelectMethod=cursor
+scarab.test.database.username.mssql=${scarab.database.username}
+scarab.test.database.password.mssql=${scarab.database.password}
+scarab.database.jdbc.driver.jar.mssql=ms*.jar
+scarab.database.manual.creation.mssql=true
+
+# ==================
+# End of Group mssql
+# ==================
+
+
+# =============
+# Group: oracle
+# =============
+#
+# scarab.jdbc.handler.oracle
+# scarab.database.port.oracle
+# scarab.database.admin.url.oracle
+# scarab.database.url.oracle
+# scarab.database.url.extensionoracle
+# scarab.database.pool.validationQuery.oracle
+# scarab.database.jdbc.driver.oracle
+# scarab.database.admin.username.oracle
+# scarab.database.admin.password.oracle
+# scarab.database.username.oracle
+# scarab.database.password.oracle
+# scarab.test.database.name.oracle
+# scarab.test.database.url.oracle
+# scarab.test.database.username.oracle
+# scarab.test.database.password.oracle
+# scarab.database.jdbc.driver.jar.oracle
+#
+# Default settings for oracle
+#
+
+scarab.jdbc.handler.oracle=oracle
+scarab.database.port.oracle=
+scarab.database.admin.url.oracle=
+scarab.database.url.oracle=
+scarab.database.url.extensionoracle=
+scarab.database.pool.validationQuery.oracle=SELECT 1 FROM DUAL
+scarab.database.jdbc.driver.oracle=oracle.jdbc.driver.OracleDriver
+scarab.database.admin.username.oracle=${scarab.database.username}
+scarab.database.admin.password.oracle=${scarab.database.password}
+scarab.database.username.oracle=sa
+scarab.database.password.oracle=
+scarab.test.database.name.oracle=${scarab.database.name}
+scarab.test.database.url.oracle=
+scarab.test.database.username.oracle=${scarab.database.username}
+scarab.test.database.password.oracle=${scarab.database.password}
+scarab.database.jdbc.driver.jar.oracle=oracle-*.jar
+
+# ===================
+# End of Group oracle
+# ===================
+
+
+# ==========
+# Group: db2
+# ==========
+#
+# scarab.jdbc.handler.db2
+# scarab.database.port.db2
+# scarab.database.admin.url.db2
+# scarab.database.url.db2
+# scarab.database.url.extension.db2
+# scarab.database.pool.validationQuery.db2
+# scarab.database.jdbc.driver.db2
+# scarab.database.admin.username.db2
+# scarab.database.admin.password.db2
+# scarab.database.username.db2
+# scarab.database.password.db2
+# scarab.test.database.name.db2
+# scarab.test.database.url.db2
+# scarab.test.database.username.db2
+# scarab.test.database.password.db2
+# scarab.database.jdbc.driver.jar.db2
+#
+# Default settings for db2
+#
+
+scarab.jdbc.handler.db2=db2
+scarab.database.port.db2=
+scarab.database.admin.url.db2=jdbc:db2:${scarab.database.name}
+scarab.database.url.db2=jdbc:db2:${scarab.database.name}
+scarab.database.url.extension.db2=
+scarab.database.pool.validationQuery.db2=SELECT 1 FROM SYSIBM.SYSDUMMY1
+scarab.database.jdbc.driver.db2=COM.ibm.db2.jdbc.app.DB2Driver
+scarab.database.admin.username.db2=${scarab.database.username}
+scarab.database.admin.password.db2=${scarab.database.password}
+scarab.database.username.db2=sa
+scarab.database.password.db2=
+scarab.test.database.name.db2=${scarab.database.name}
+scarab.test.database.url.db2=jdbc:db2:${scarab.test.database.name}
+scarab.test.database.username.db2=${scarab.database.username}
+scarab.test.database.password.db2=${scarab.database.password}
+scarab.database.jdbc.driver.jar.db2=db2java.zip
+
+# ================
+# End of Group db2
# ================
\ No newline at end of file
Modified: trunk/www/book/install-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/install-en.xml?view=diff&rev=10146&p1=trunk/www/book/install-en.xml&p2=trunk/www/book/install-en.xml&r1=10145&r2=10146
==============================================================================
--- trunk/www/book/install-en.xml (original)
+++ trunk/www/book/install-en.xml 2006-06-05 13:53:06-0700
@@ -185,7 +185,7 @@
<para>If you build a "production" Scarab installation, you may choose to use a MySQL driver that is more recent and more performant than the one supplied in the Scarab distribution (this driver may not be bundled with Scarab because its licence is GPL).</para>
<para>Download this driver from the MySQL web site at the following URL: <ulink url="http://www.mysql.com/downloads/api-jdbc-dev.html">http://www.mysql.com/downloads/api-jdbc-dev.html</ulink> and copy the jar in the lib directory of your Scarab installation.</para>
<para>You also need to declare its use in your build.properties file:</para>
- <para>scarab.jdbc.driver.jar=mysql-connector*.jar</para>
+ <para>scarab.database.jdbc.driver.jar=mysql-connector*.jar</para>
</sect3>
</sect2>
<sect2>
Modified: trunk/www/book/install-fr.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/install-fr.xml?view=diff&rev=10146&p1=trunk/www/book/install-fr.xml&p2=trunk/www/book/install-fr.xml&r1=10145&r2=10146
==============================================================================
--- trunk/www/book/install-fr.xml (original)
+++ trunk/www/book/install-fr.xml 2006-06-05 13:53:06-0700
@@ -192,7 +192,7 @@
<para>Téléchargez ce driver sur le site de MySQL à l'URL suivante: <ulink url="http://www.mysql.com/downloads/api-jdbc-dev.html">http://www.mysql.com/downloads/api-jdbc-dev.html</ulink>
et copiez-le dans le répertoire lib de votre installation de Scarab.</para>
<para>Vous devez aussi déclarer l'utilisation de ce nouveau driver dans votre fichier build.properties:</para>
- <para>scarab.jdbc.driver.jar=mysql-connector*.jar</para>
+ <para>scarab.database.jdbc.driver.jar=mysql-connector*.jar</para>
</sect3>
</sect2>
<sect2>
Modified: trunk/xdocs/howto/build-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/build-howto.xml?view=diff&rev=10146&p1=trunk/xdocs/howto/build-howto.xml&p2=trunk/xdocs/howto/build-howto.xml&r1=10145&r2=10146
==============================================================================
--- trunk/xdocs/howto/build-howto.xml (original)
+++ trunk/xdocs/howto/build-howto.xml 2006-06-05 13:53:06-0700
@@ -123,7 +123,7 @@
</p>
<p>
<code>
- scarab.jdbc.driver.jar=mysql-connector*.jar
+ scarab.database.jdbc.driver.jar=mysql-connector*.jar
</code>
</p>
<p>
Modified: trunk/xdocs/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/scarab_properties.xml?view=diff&rev=10146&p1=trunk/xdocs/scarab_properties.xml&p2=trunk/xdocs/scarab_properties.xml&r1=10145&r2=10146
==============================================================================
--- trunk/xdocs/scarab_properties.xml (original)
+++ trunk/xdocs/scarab_properties.xml 2006-06-05 13:53:06-0700
@@ -1983,8 +1983,8 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.mysql</name>
- <default>mm.mysql-*.jar</default>
+ <name>scarab.database.jdbc.driver.jar.mysql</name>
+ <default>mysql-*.jar</default>
<comment/>
<type>Runtime</type>
<customization modification="optional">basic</customization>
@@ -2120,7 +2120,7 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.postgres</name>
+ <name>scarab.database.jdbc.driver.jar.postgres</name>
<default>postgresql-*.jar</default>
<comment/>
<type>Runtime</type>
@@ -2274,7 +2274,7 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.hypersonic</name>
+ <name>scarab.database.jdbc.driver.jar.hypersonic</name>
<default>hsqldb*.jar</default>
<comment/>
<type>Runtime</type>
@@ -2411,7 +2411,7 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.mssql</name>
+ <name>scarab.database.jdbc.driver.jar.mssql</name>
<default>ms*.jar</default>
<comment/>
<type>Runtime</type>
@@ -2556,7 +2556,7 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.oracle</name>
+ <name>scarab.database.jdbc.driver.jar.oracle</name>
<default>oracle-*.jar</default>
<comment/>
<type>Runtime</type>
@@ -2693,7 +2693,7 @@
<file/>
</property>
<property>
- <name>scarab.jdbc.driver.jar.db2</name>
+ <name>scarab.database.jdbc.driver.jar.db2</name>
<default>db2java.zip</default>
<comment/>
<type>Runtime</type>