OFBIZ-13412 - Removing a few remaining references of Derby and updating it with H2. Thank you Deepak Dixit for reporting about these references.

Author: ashishvijaywargiya

.gitignore

@@ -13,7 +13,7 @@ runtime/logs/*.log*
 runtime/logs/*.html*
 runtime/logs/test-results/*
 runtime/logs/birt
-runtime/data/derby/*
+runtime/data/h2/*
 runtime/data/utilcache.*
 runtime/catalina/work/*
 runtime/tempfiles/*

.hgignore

@@ -1,7 +1,7 @@
 syntax: regexp
 ^(framework|applications|plugins)/[^/]+/build/.*$
 ^ofbiz\.jar$
-^runtime/data/derby/.*$
+^runtime/data/h2/.*$
 ^runtime/logs/.*(log|html)(|.\d+)$
 ^runtime/logs/access_log.\d\d\d\d-\d\d-\d\d$
 ^runtime/(catalina/work|logs/test-results)/.*$

DOCKER.adoc

@@ -158,15 +158,15 @@ data, such as a chart of accounts.
 
 ==== Database
 
-By default the OFBiz container will use an internal Derby database,
+By default the OFBiz container will use an internal H2 database,
 storing database related files in the /ofbiz/runtime volume.
 
 Use of an external database can be configured through environment
 variables.
 
-===== Derby
+===== H2
 
-To use the embedded Derby database, ensure all database related
+To use the embedded H2 database, ensure all database related
 environment variables are unset.
 
 ===== PostgreSQL

README.md

@@ -464,7 +464,7 @@ following project parameters are passed:
 * tenantName: optional, default is value of tenantId
 * domainName: optional, default is org.apache.ofbiz
 * tenantReaders: optional, default value is seed,seed-initial,demo
-* dbPlatform: optional, D(Derby), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
+* dbPlatform: optional, H(H2), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
 * dbIp: optional, ip address of the database
 * dbUser: optional, username of the database
 * dbPassword: optional, password of the database
@@ -794,7 +794,7 @@ then the build execution will fail.
 
 ### Setup an external database like MySQL, PostgreSQL, etc
 
-To setup an external database instead of the default embedded Apache Derby, you
+To setup an external database instead of the default embedded H2 database, you
 will need to follow the following instructions:
 
 1.  Find the JDBC driver suitable for your database using one of the following

build.gradle

@@ -459,17 +459,17 @@ task loadTenant(group: ofbizServer, description: 'Load data using tenantId') {
 
 task createTenant(group: ofbizServer, description: 'Create a new tenant in your environment') {
 
-    def databaseTemplateFile = "${rootDir}/framework/resources/templates/AdminNewTenantData-Derby.xml"
+    def databaseTemplateFile = "${rootDir}/framework/resources/templates/AdminNewTenantData-H2.xml"
 
     task prepareAndValidateTenantArguments {
         doLast {
             if (!project.hasProperty('tenantId')) {
                 throw new GradleException('Project property tenantId is missing')
             }
-            // dbPlatform values: D(Derby), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
+            // dbPlatform values: H(H2), M(MySQL), O(Oracle), P(PostgreSQL) (default D)
             if (project.hasProperty('dbPlatform')) {
-                if (dbPlatform == 'D') {
-                    databaseTemplateFile = "${rootDir}/framework/resources/templates/AdminNewTenantData-Derby.xml"
+                if (dbPlatform == 'H') {
+                    databaseTemplateFile = "${rootDir}/framework/resources/templates/AdminNewTenantData-H2.xml"
                 } else if (dbPlatform == 'M') {
                     databaseTemplateFile = "${rootDir}/framework/resources/templates/AdminNewTenantData-MySQL.xml"
                 } else if (dbPlatform == 'O') {

docker/docker-entrypoint.sh

@@ -62,7 +62,7 @@
 # Default value: <empty>
 #
 # OFBIZ_SKIP_DB_DRIVER_DOWNLOAD
-# When connecting to databases other than the OFBiz embedded Derby database a suitable driver will be needed.
+# When connecting to databases other than the OFBiz embedded H2 database a suitable driver will be needed.
 # This script will attempt to download a suitable driver unless the OFBIZ_SKIP_DB_DRIVER_DOWNLOAD contains a non-empty
 # value.
 #

framework/entity/config/entityengine.xml

@@ -738,7 +738,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
       http://support.microsoft.com/kb/820773/
      c. Demo data are in conflict with Entity Unique Index when loading data
       This is a known issue with MsSQL since https://markmail.org/message/mezqxb3eyzz3xpv6
-      The problem does not exist with Derby, nor with the mostly open source DBMS used with OFBiz: Postres, MySQL, MariaDB, etc.
+      The problem does not exist with H2, nor with the mostly open source DBMS used with OFBiz: Postres, MySQL, MariaDB, etc.
       So we will not change the current OOTB setting and suggest to simply change your own configuration. See OFBIZ-11998 for more.
     -->
     <datasource name="localmssql"
@@ -825,7 +825,7 @@ access. For a detailed description see the core/docs/entityconfig.html file.
     </datasource>
 
     <!-- According to http://markmail.org/message/s75sf6zhtizzkqbv Since version V6R1 (AS/400, db2) there is no need for an own fieldtype.xml - just use the h2-fieldtypes like this: -->
-    <!-- Beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index, not sure it's needed with DB2 -->
+    <!-- Beware use-indices-unique="false" is needed because of H2 bug with null values in a unique index, not sure it's needed with DB2 -->
     <datasource name="DB2"
             helper-class="org.apache.ofbiz.entity.datasource.GenericHelperDAO"
             schema-name="OFBIZ"