You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/06 09:54:40 UTC
[openmeetings] branch OPENMEETINGS-2076-h2-db created (now 75203fe)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENMEETINGS-2076-h2-db
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
at 75203fe [OPENMEETINGS-2076] tests seems to pass, web installer need to be checked
This branch includes the following new commits:
new 75203fe [OPENMEETINGS-2076] tests seems to pass, web installer need to be checked
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openmeetings] 01/01: [OPENMEETINGS-2076] tests seems to pass,
web installer need to be checked
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-2076-h2-db
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 75203fe69da1451168604de79647e90c9a0128ab
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 6 16:54:22 2019 +0700
[OPENMEETINGS-2076] tests seems to pass, web installer need to be checked
---
openmeetings-db/pom.xml | 13 +++-----
.../java/org/apache/openmeetings/cli/Admin.java | 2 +-
.../cli/ConnectionPropertiesPatcher.java | 7 +++--
.../cli/{DerbyPatcher.java => H2Patcher.java} | 12 ++++----
openmeetings-server/src/site/site.xml | 2 +-
openmeetings-server/src/site/xdoc/Clustering.xml | 2 +-
.../src/site/xdoc/CommandLineAdmin.xml | 2 +-
.../xdoc/{ApacheDerbyConfig.xml => H2Config.xml} | 30 +++++++------------
openmeetings-server/src/site/xdoc/installation.xml | 2 +-
.../openmeetings/util/ConnectionProperties.java | 8 ++---
openmeetings-web/pom.xml | 23 ++++----------
.../web/app/Application.properties.xml | 4 +--
.../web/app/Application_ar.properties.xml | 4 +--
.../web/app/Application_bg.properties.xml | 4 +--
.../web/app/Application_bn.properties.xml | 4 +--
.../web/app/Application_ca.properties.xml | 4 +--
.../web/app/Application_cs.properties.xml | 4 +--
.../web/app/Application_da.properties.xml | 4 +--
.../web/app/Application_de.properties.xml | 4 +--
.../web/app/Application_el.properties.xml | 4 +--
.../web/app/Application_es.properties.xml | 4 +--
.../web/app/Application_fa.properties.xml | 4 +--
.../web/app/Application_fi.properties.xml | 4 +--
.../web/app/Application_fr.properties.xml | 4 +--
.../web/app/Application_gl.properties.xml | 4 +--
.../web/app/Application_he.properties.xml | 4 +--
.../web/app/Application_hu.properties.xml | 4 +--
.../web/app/Application_in.properties.xml | 4 +--
.../web/app/Application_it.properties.xml | 4 +--
.../web/app/Application_ja.properties.xml | 4 +--
.../web/app/Application_ko.properties.xml | 4 +--
.../web/app/Application_nl.properties.xml | 4 +--
.../web/app/Application_pl.properties.xml | 4 +--
.../web/app/Application_pt.properties.xml | 4 +--
.../web/app/Application_pt_BR.properties.xml | 4 +--
.../web/app/Application_ru.properties.xml | 4 +--
.../web/app/Application_sk.properties.xml | 4 +--
.../web/app/Application_sv.properties.xml | 4 +--
.../web/app/Application_th.properties.xml | 4 +--
.../web/app/Application_tr.properties.xml | 4 +--
.../web/app/Application_uk.properties.xml | 4 +--
.../web/app/Application_zh_CN.properties.xml | 4 +--
.../web/app/Application_zh_TW.properties.xml | 4 +--
.../web/pages/install/InstallWizard.java | 17 +++++------
.../{derby_persistence.xml => h2_persistence.xml} | 4 +--
.../org/apache/openmeetings/cli/TestAdmin.java | 22 +++++++-------
.../{derby => h2}/PrepareSystemFiles.java | 6 ++--
.../web/pages/install/TestInstall.java | 35 ++++++----------------
pom.xml | 4 +--
49 files changed, 138 insertions(+), 181 deletions(-)
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 64d921a..8d436a3 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -97,14 +97,9 @@
<version>${commons-pool2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbyclient</artifactId>
- <version>${derby.version}</version>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
@@ -139,7 +134,7 @@
<includes>**/entity/**/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
<enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- <persistenceXmlFile>${project.parent.basedir}/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml</persistenceXmlFile>
+ <persistenceXmlFile>${project.parent.basedir}/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml</persistenceXmlFile>
</configuration>
<executions>
<execution>
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 77b8c9c..42f9f61 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -320,7 +320,7 @@ public class Admin {
|| cmdl.hasOption(OPTION_DB_PORT) || cmdl.hasOption(OPTION_DB_NAME) || cmdl.hasOption(OPTION_DB_USER)
|| cmdl.hasOption(OPTION_DB_PASS))
{
- String dbType = cmdl.getOptionValue(OPTION_DB_TYPE, DbType.derby.name());
+ String dbType = cmdl.getOptionValue(OPTION_DB_TYPE, DbType.h2.name());
connectionProperties = ConnectionPropertiesPatcher.patch(dbType
, cmdl.getOptionValue(OPTION_DB_HOST, "localhost")
, cmdl.getOptionValue(OPTION_DB_PORT, null)
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
index 6fc273d..3a2f2e0 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java
@@ -65,9 +65,10 @@ public abstract class ConnectionPropertiesPatcher {
case postgresql:
patcher = new PostgresPatcher();
break;
- case derby:
+ case h2:
default:
- patcher = new DerbyPatcher();
+ patcher = new H2Patcher();
+ props.setLogin("omuser");
break;
}
patcher.props = props;
@@ -129,7 +130,7 @@ public abstract class ConnectionPropertiesPatcher {
protected void patchAttribute(String[] tokens) {
for (int i = 0; i < tokens.length; ++i) {
- patchProp(tokens, i, USER_PREFIX, props.getLogin());
+ patchProp(tokens, i, USER_PREFIX, props.getLogin() == null ? "" : props.getLogin());
patchProp(tokens, i, PASS_PREFIX, props.getPassword() == null ? "" : props.getPassword());
patchProp(tokens, i, URL_PREFIX, props.getURL());
}
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/H2Patcher.java
similarity index 71%
rename from openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
rename to openmeetings-install/src/main/java/org/apache/openmeetings/cli/H2Patcher.java
index c79aa1a..44ee7f8 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/DerbyPatcher.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/H2Patcher.java
@@ -18,12 +18,12 @@
*/
package org.apache.openmeetings.cli;
-public class DerbyPatcher extends ConnectionPropertiesPatcher {
+public class H2Patcher extends ConnectionPropertiesPatcher {
@Override
- protected String getUrl(String _url, String host, String _port, String _db) {
- String db = (_db == null) ? DEFAULT_DB_NAME : _db;
- int idx = _url.indexOf(';');
- String suffix = idx > -1 ? _url.substring(idx) : "";
- return String.format("jdbc:derby:%s%s", db, suffix);
+ protected String getUrl(String inUrl, String host, String _port, String inDb) {
+ String db = (inDb == null) ? "./" + DEFAULT_DB_NAME : inDb;
+ int idx = inUrl.indexOf(';');
+ String suffix = idx > -1 ? inUrl.substring(idx) : "";
+ return String.format("jdbc:h2:%s%s", db, suffix);
}
}
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index 9911337..a4b2a10 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -64,7 +64,7 @@
<item name="Redmine Plugin" href="/RedminePlugin.html" />
</item>
<item name="DB Sample Configurations" href="#db">
- <item name="Apache Derby" href="/ApacheDerbyConfig.html" />
+ <item name="H2" href="/H2Config.html" />
<item name="IBM DB2" href="/IBMDB2Config.html" />
<item name="Oracle" href="/OracleConfig.html" />
<item name="MySQL" href="/MySQLConfig.html" />
diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml
index 1b2fd9a..3002e99 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -75,7 +75,7 @@
<subsection name="Database">
<div>All servers should be configured to use the same database. It can be on the server or on the one node
of the cluster.<br/>
- <div class="bd-callout bd-callout-danger">NOTE: Db other than Derby should be used</div>
+ <div class="bd-callout bd-callout-danger">NOTE: Db other than H2 should be used</div>
</div>
<ul>
<li>Add users who can connect to the database remotely</li>
diff --git a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
index 7ed175c..e49f897 100644
--- a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
+++ b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
@@ -35,7 +35,7 @@
--db-type mysql --db-name openmeetings_db --email-auth-user noreply@webbase-design.de --password 123qweAsd! \
--system-email-address noreply@webbase-design.de --db-user root --db-host localhost --email-auth-pass 123qweasd
</source>
- <p>Derby (Not recommended for production environment):</p>
+ <p>H2 (Not recommended for production environment):</p>
<source>./admin.sh -i -v -tz Europe/Berlin -email seba.wagner@gmail.com -group webbase -user admin --smtp-server localhost \
--email-auth-user noreply@webbase-design.de --password 123qweasd --system-email-address noreply@webbase-design.de --email-auth-pass 123qweasd
</source>
diff --git a/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml b/openmeetings-server/src/site/xdoc/H2Config.xml
similarity index 67%
rename from openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml
rename to openmeetings-server/src/site/xdoc/H2Config.xml
index a3071ba..d50f263 100644
--- a/openmeetings-server/src/site/xdoc/ApacheDerbyConfig.xml
+++ b/openmeetings-server/src/site/xdoc/H2Config.xml
@@ -13,45 +13,37 @@
limitations under the License.
-->
<document xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
- <title>Apache Derby Configuration</title>
+ <title>H2 Configuration</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
</properties>
-
<body>
- <section name="Apache Derby Configuration">
-
+ <section name="H2 Configuration">
<p>
- OpenMeetings default configuration is to use Apache Derby.
+ OpenMeetings default configuration is to use H2.
</p>
-
<p>
It is recommended for production environments and high
- availibility to change to an usual relational database like MySQL,
- Postgres or DB2.
+ availibility to change to an usual relational database like Oracle, MySQL,
+ Postgres, MSSQL or DB2.
</p>
<p>
- For more information about Apache Derby see
- <a href="http://db.apache.org/derby/">http://db.apache.org/derby/</a>
+ For more information about H2 see
+ <a href="https://www.h2database.com">https://www.h2database.com</a>
</p>
-
<p>
- There is a sample configuration for Apache Derby that ships with
+ There is a sample configuration for H2 that ships with
every release in:
<br />
- /webapps/openmeetings/WEB-INF/classes/META-INF/derby_persistence.xml
+ /webapps/openmeetings/WEB-INF/classes/META-INF/h2_persistence.xml
</p>
-
<p>
If you encounter issues, you can drop the db and then run the web
based installer again
</p>
-
</section>
-
</body>
-
</document>
diff --git a/openmeetings-server/src/site/xdoc/installation.xml b/openmeetings-server/src/site/xdoc/installation.xml
index 239e2c7..b5c57a4 100644
--- a/openmeetings-server/src/site/xdoc/installation.xml
+++ b/openmeetings-server/src/site/xdoc/installation.xml
@@ -79,7 +79,7 @@
<li>
<b>Recommendation for production environment</b>
<div style="margin-top: 10px; margin-bottom:10px">
- By default OpenMeetings uses the integrated Apache Derby database.
+ By default OpenMeetings uses the integrated H2 database.
For production environment you should consider using
<a href="MySQLConfig.html">MySQL</a>
,
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
index 9bdd639..5f338d4 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/ConnectionProperties.java
@@ -25,18 +25,18 @@ public class ConnectionProperties implements Serializable {
public enum DbType {
db2
- , derby
+ , h2
, mssql
, mysql
, oracle
, postgresql
}
- private String driver = "org.apache.derby.jdbc.EmbeddedDriver";
- private String url = "jdbc:derby:openmeetings";
+ private String driver = "org.h2.Driver";
+ private String url = "jdbc:h2:./omdb";
private String login = "user";
private String password = "secret";
- private DbType dbType = DbType.derby;
+ private DbType dbType = DbType.h2;
public String getDriver() {
return driver;
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6cc8f1b..bc7f971 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -446,7 +446,7 @@
</goals>
<configuration>
<overwrite>true</overwrite>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <outputDirectory>${project.build.directory}/test-root/WEB-INF/classes/</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/java</directory>
@@ -479,14 +479,6 @@
<include>**/*.properties</include>
</includes>
</resource>
- <resource>
- <directory>${project.build.directory}/generated-test-res</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.build.directory}/test-root/WEB-INF/classes/</directory>
- <filtering>true</filtering>
- </resource>
</resources>
<skip>${om.quick.build}</skip>
</configuration>
@@ -516,8 +508,8 @@
<phase>generate-test-resources</phase>
<configuration>
<target>
- <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml"
- tofile="${project.build.directory}/generated-test-res/META-INF/persistence.xml"
+ <copy file="${project.basedir}/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml"
+ tofile="${project.build.directory}/test-root/WEB-INF/classes/META-INF/persistence.xml"
overwrite="true" force="true"/>
</target>
</configuration>
@@ -542,6 +534,9 @@
<current_openmeetings_log_dir>${project.build.directory}</current_openmeetings_log_dir>
<current_openmeetings_context_name>openmeetings</current_openmeetings_context_name>
</systemPropertyVariables>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${project.build.directory}/test-root/WEB-INF/classes</additionalClasspathElement>
+ </additionalClasspathElements>
<skip>${maven.test.skip}</skip>
</configuration>
</plugin>
@@ -704,12 +699,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
</dependency>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index fa4c41f..81c47c4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 8108c3c..810aa3a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 98283f2..47985a6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index 3f000c9..654e9ce 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index d5a639c..165fd9b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 862e94c..752f12c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 5ec323b..4f81ba5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 5b75cda..73bd6dd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index d53d8c2..9e5bb8e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index fba8cb4..f005460 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Especifique nombre BD]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Tipo base de datos]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Error inesperado en el parcheo del archivo persistence: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Incapaz obtener propiedades]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[BD Configuración]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Especifique BD host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 3123795..42b6f62 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -689,13 +689,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[نام پایگاه داده را مشخص کنید]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[مشخص کردن نوع DB]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[یک خطای غیرمنتظره حین اتصال فایل پایداری:]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[دسترسی به ویژگی ها مقدور نیست]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[پیکربندی DB]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[مشخص کردن DBhost]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://ito.gov.ir/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://ito.gov.ir/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://ito.gov.ir/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://ito.gov.ir MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://ito.gov.ir/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 428a7ee..6944831 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index d3ab6ce..7860021 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Indiquez le nom de la base de données (BDD)]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choisissez le type BDD]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Erreur inattendue lors de l'application du correctif sur le fichier de persistance: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Impossible d'obtenir les propriétés]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[Configuration BDD]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Indiquez le nom d'hôte du serveur BDD]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 45d9598..090b672 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index fa4c41f..81c47c4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index e71abd8..5a658b8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index f8e8ce5..310d094 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index 0927749..35718b7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specifica il nome del database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Scegli il tipo di DB]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Errore inaspettato nell'aggiornamento del file persistence: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Impossibile recuperare le proprietà]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[Configurazione DB]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specifica l'host DB]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index dd78e52..375b031 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[データベース名を指定してください]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[データベース・タイプを選択]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[下記パッチ適用中にエラーが発生しました: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[プロパティを取得できません]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[データベース構成]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[データベース・ホスト名を指定してください]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index eb1fae4..706c8d1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 2db5d6e..122b136 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 3e01595..390a749 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index f907778..0083106 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 0dc6156..3487be6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index d2b3e1b..105df4c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Укажите имя базы данных]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Выберите тип БД]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Неожиданная ошибка при обновлении файла persistence.xml: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Невозможно взять конфигурацию]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[Конфигурация базы данных]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Укажите имя сервера БД]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 29bf26e..79f1567 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 81e0a66..0d4a81f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 5e04fe6..9eafa62 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 2d0445a..b89c1bd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index d4c679b..671df6d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Вкажіть ім'я бази даних]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Виберіть тип БД]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Несподівана помилка при оновленні файлу persistence.xml: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Неможливо взяти конфігурацію]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[Конфігурація бази даних]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Вкажіть ім'я сервера БД]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 1fae36b..6932941 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[定义数据库名称]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[选择数据库类型]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[意外错误，同时修补持久性文件：{0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[无法获得属性]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[数据库配置]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[定义数据库主机]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 793f308..5b60c91 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -690,13 +690,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
<entry key="install.wizard.db.step.dbtype"><![CDATA[Choose DB type]]></entry>
- <entry key="install.wizard.db.step.derby.name"><![CDATA[Apache Derby]]></entry>
+ <entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
<entry key="install.wizard.db.step.errorprops"><![CDATA[Unable to get the properties]]></entry>
<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
<entry key="install.wizard.db.step.host"><![CDATA[Specify DB host]]></entry>
<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
- <entry key="install.wizard.db.step.instructions.derby"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/ApacheDerbyConfig.html">Apache Derby</a>]]></entry>
+ <entry key="install.wizard.db.step.instructions.h2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/H2Config.html">H2</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mssql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MSSQLConfig.html">MSSQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.mysql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/MySQLConfig.html">MySQL</a>]]></entry>
<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index 5edaf3c..930ee59 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -273,9 +273,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
case oracle:
sql = "SELECT 1 FROM DUAL";
break;
- case derby:
- sql = "SELECT 1 FROM SYSIBM.SYSDUMMY1";
- break;
default:
sql = "SELECT 1";
break;
@@ -331,7 +328,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
return props; // initial select
}
props = ConnectionPropertiesPatcher.getConnectionProperties(conf);
- if (DbType.derby != props.getDbType()) {
+ if (DbType.h2 != props.getDbType()) {
// resetting default login/password
props.setLogin(null);
props.setPassword(null);
@@ -345,10 +342,10 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
private void initForm(boolean getProps, AjaxRequestTarget target) {
ConnectionProperties props = getProps ? getProps(form.getModelObject().getDbType()) : form.getModelObject();
form.setModelObject(props);
- host.setVisible(props.getDbType() != DbType.derby);
- port.setVisible(props.getDbType() != DbType.derby);
- user.setVisible(props.getDbType() != DbType.derby);
- pass.setVisible(props.getDbType() != DbType.derby);
+ host.setVisible(props.getDbType() != DbType.h2);
+ port.setVisible(props.getDbType() != DbType.h2);
+ user.setVisible(props.getDbType() != DbType.h2);
+ pass.setVisible(props.getDbType() != DbType.h2);
try {
switch (props.getDbType()) {
case mssql: {
@@ -367,7 +364,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
dbname.setModelObject(parts[5]);
}
break;
- case derby: {
+ case h2: {
host.setModelObject("");
port.setModelObject(0);
String[] parts = props.getURL().split(";");
@@ -393,7 +390,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().getAppName(), getString("install.wizard.db.step.instructions.derby")
+ add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().getAppName(), getString("install.wizard.db.step.instructions.h2")
, getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
, getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
, getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml
similarity index 97%
rename from openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
rename to openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml
index 0e49842..cb04df2 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/h2_persistence.xml
@@ -61,8 +61,8 @@
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp2.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
- value="DriverClassName=org.apache.derby.jdbc.EmbeddedDriver
- , Url=jdbc:derby:openmeetings;create=true
+ value="DriverClassName=org.h2.Driver
+ , Url=jdbc:h2:./omdb;create=true
, create=true
, maxTotal=100
, maxIdle=100
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 72d803e..5d8ec8f 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -30,14 +30,14 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_CONTEXT
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
-import static org.apache.openmeetings.web.pages.install.TestInstall.resetDerbyHome;
-import static org.apache.openmeetings.web.pages.install.TestInstall.setDerbyHome;
+import static org.apache.openmeetings.web.pages.install.TestInstall.resetH2Home;
+import static org.apache.openmeetings.web.pages.install.TestInstall.setH2Home;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
-import java.io.IOException;
import java.nio.file.Files;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@@ -54,17 +54,17 @@ public class TestAdmin {
File tempFolder;
@BeforeEach
- public void setUp() throws IOException {
+ public void setUp() throws Exception {
setOmHome();
System.setProperty("user.dir", tempFolder.getCanonicalPath());
System.setProperty(OM_HOME, getOmHome().getCanonicalPath());
- setDerbyHome(tempFolder);
+ setH2Home(tempFolder);
System.setProperty("context", UUID.randomUUID().toString());
}
@AfterEach
- public void tearDown() {
- resetDerbyHome();
+ public void tearDown() throws Exception {
+ resetH2Home();
System.getProperties().remove(OM_HOME);
WebApplication app = (WebApplication)Application.get(getWicketApplicationName());
if (app != null) {
@@ -108,13 +108,12 @@ public class TestAdmin {
}
private static void performInstall(Admin admin, String... args) throws Exception {
- List<String> params = Arrays.asList("-i"
+ List<String> params = new ArrayList<>(Arrays.asList("-i"
, "-tz", "Europe/Berlin"
, "-email", email
, "-group", group
, "-user", adminUsername
- , "--password", userpass
- , "--db-name", UUID.randomUUID().toString().replaceAll("-", ""));
+ , "--password", userpass));
for (String a : args) {
params.add(a);
}
@@ -123,8 +122,9 @@ public class TestAdmin {
@Test
public void testInstallBackup() throws Exception {
+ String tempDB = Files.createTempFile("omtempdb", null).toFile().getCanonicalPath();
Admin a = new Admin();
- performInstall(a);
+ performInstall(a, "--db-name", tempDB);
//backup
a.process("-b");
//backup to file
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/derby/PrepareSystemFiles.java b/openmeetings-web/src/test/java/org/apache/openmeetings/h2/PrepareSystemFiles.java
similarity index 91%
rename from openmeetings-web/src/test/java/org/apache/openmeetings/derby/PrepareSystemFiles.java
rename to openmeetings-web/src/test/java/org/apache/openmeetings/h2/PrepareSystemFiles.java
index 3e6f6f7..0664508 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/derby/PrepareSystemFiles.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/h2/PrepareSystemFiles.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.derby;
+package org.apache.openmeetings.h2;
import java.io.File;
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This file is called from command line to patch the derby configuration
+ * This file is called from command line to patch the h2 configuration
* during the automated run of Selenium
*
* @author swagner
@@ -50,7 +50,7 @@ public class PrepareSystemFiles {
conf.delete();
}
- ConnectionPropertiesPatcher.patch(DbType.derby.name()
+ ConnectionPropertiesPatcher.patch(DbType.h2.name()
, "localhost"
, "1527"
, databaseHomeDirectory + "openmeetings"
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 5a1b857..366f96b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -36,16 +36,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
-import java.io.IOException;
import java.nio.file.Files;
-import java.sql.DriverManager;
-import java.sql.SQLException;
import java.util.Locale;
import java.util.Random;
import java.util.TimeZone;
import org.apache.openmeetings.AbstractSpringTest;
import org.apache.openmeetings.AbstractWicketTester;
+import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
import org.apache.openmeetings.util.crypt.SCryptImplementation;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -62,41 +60,26 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.ButtonAjaxBehavior;
public class TestInstall {
private static final Logger log = LoggerFactory.getLogger(TestInstall.class);
- private static final String DERBY_HOME = "derby.system.home";
private static final String WIZARD_PATH = "wizard";
private File tempFolder;
protected WicketTester tester;
protected Random rnd = new Random();
- public static void setDerbyHome(File f) throws IOException {
- System.setProperty(DERBY_HOME, f.getCanonicalPath());
- try {
- Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
- } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
- log.error("Fail to re-init Derby", e);
- }
+ public static void setH2Home(File f) throws Exception {
+ ConnectionPropertiesPatcher.patch("h2", null, null, f.getCanonicalPath(), null, null);
}
- public static void resetDerbyHome() {
- try {
- DriverManager.getConnection("jdbc:derby:;shutdown=true");
- } catch (SQLException e) {
- if ("XJ015".equals(e.getSQLState()) && 50000 == e.getErrorCode()) {
- log.info("Derby shutdown successfully");
- } else {
- log.error("Fail to shutdown Derby", e);
- }
- }
- System.getProperties().remove(DERBY_HOME);
+ public static void resetH2Home() throws Exception {
+ ConnectionPropertiesPatcher.patch("h2", null, null, null, null, null);
}
@BeforeEach
- public void setUp() throws IOException {
+ public void setUp() throws Exception {
log.info("Going to perform setup for TestInstall");
AbstractSpringTest.setOmHome();
setWicketApplicationName(DEFAULT_APP_NAME);
tempFolder = Files.createTempDirectory("omtempdb").toFile();
- setDerbyHome(tempFolder);
+ setH2Home(tempFolder);
tester = getWicketTester((Application)ensureApplication(-1L));
assertNotNull(WebSession.get(), "Web session should not be null");
Locale[] locales = Locale.getAvailableLocales();
@@ -105,11 +88,11 @@ public class TestInstall {
}
@AfterEach
- public void tearDown() throws IOException {
+ public void tearDown() throws Exception {
log.info("Going to perform clean-up for TestInstall");
AbstractWicketTester.destroy(tester);
log.info("WicketTester is destroyed");
- resetDerbyHome();
+ resetH2Home();
deleteDirectory(tempFolder);
log.info("Clean-up complete");
}
diff --git a/pom.xml b/pom.xml
index 1a3cf0a..9de66a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<maven.build.timestamp.format>yyyy/MM/dd HH:mm</maven.build.timestamp.format>
<wicket.configuration>DEPLOYMENT</wicket.configuration>
<om.quick.build>false</om.quick.build>
- <db>derby</db>
+ <db>h2</db>
<jdk.version>11</jdk.version>
<!-- plugin versions -->
<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
@@ -87,7 +87,7 @@
<jettison.version>1.4.0</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
<src.pack.skip>false</src.pack.skip>
- <derby.version>10.14.2.0</derby.version>
+ <h2.version>1.4.199</h2.version>
<commons-lang3.version>3.9</commons-lang3.version>
<javax.mail.version>1.6.2</javax.mail.version>
<openjpa.version>3.1.0</openjpa.version>