You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2022/03/03 16:33:40 UTC
[empire-db] branch master updated: EMPIREDB-379 fixed typo 'dbmsHandlerProperites'
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 6f706ec EMPIREDB-379 fixed typo 'dbmsHandlerProperites'
6f706ec is described below
commit 6f706ec3c1f796ad5598b4ec2559a605b60f4114
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Thu Mar 3 17:33:37 2022 +0100
EMPIREDB-379 fixed typo 'dbmsHandlerProperites'
---
.../empire-db-example-advanced/config.xml | 28 +++++++++++-----------
.../empire/samples/db/advanced/SampleAdvApp.java | 2 +-
.../empire-db-example-basic/config.xml | 28 +++++++++++-----------
.../org/apache/empire/samples/db/SampleApp.java | 2 +-
.../jsf2/websample/web/SampleApplication.java | 2 +-
.../src/main/webapp/WEB-INF/config.xml | 28 +++++++++++-----------
.../apache/empire/rest/app/SampleServiceApp.java | 2 +-
.../src/main/webapp/WEB-INF/config.xml | 28 +++++++++++-----------
.../jsf2/pageelements/BeanListPageElement.java | 2 +-
9 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/empire-db-examples/empire-db-example-advanced/config.xml b/empire-db-examples/empire-db-example-advanced/config.xml
index 666ff45..e53b18a 100644
--- a/empire-db-examples/empire-db-example-advanced/config.xml
+++ b/empire-db-examples/empire-db-example-advanced/config.xml
@@ -33,9 +33,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.hsql.DBMSHandlerHSql</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-hsqldb>
<properties-mysql>
@@ -47,9 +47,9 @@
<jdbcPwd>esteam</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.mysql.DBMSHandlerMySQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLEADV</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-mysql>
<properties-postgresql>
@@ -61,9 +61,9 @@
<jdbcPwd>DBSAMPLE</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-postgresql>
<properties-h2>
@@ -75,9 +75,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.h2.DBMSHandlerH2</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLEADV</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-h2>
<properties-derby>
@@ -89,9 +89,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.derby.DBMSHandlerDerby</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLEADV</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-derby>
<properties-oracle>
@@ -103,9 +103,9 @@
<jdbcPwd>DBSAMPLEADV</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.oracle.DBMSHandlerOracle</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<schemaName>DBSAMPLEADV</schemaName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-oracle>
<properties-sqlserver>
@@ -116,12 +116,12 @@
<jdbcPwd>jdbcPwd</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.sqlserver.DBMSHandlerMSSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLEADV</databaseName>
<useSequenceTable>false</useSequenceTable>
<!-- useDateTime2: set to false for databases using DATETIME for timestamps instead of DATETIME2 -->
<useDateTime2>true</useDateTime2>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-sqlserver>
<!-- log4j configuration node -->
diff --git a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
index f9b7981..0cdabfb 100644
--- a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
+++ b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvApp.java
@@ -639,7 +639,7 @@ public class SampleAdvApp
DBMSHandler dbms = (DBMSHandler) Class.forName(dbmsHandlerClass).newInstance();
// Configure dbms
- config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperites");
+ config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperties");
// done
return dbms;
diff --git a/empire-db-examples/empire-db-example-basic/config.xml b/empire-db-examples/empire-db-example-basic/config.xml
index 7d21c6d..577407f 100644
--- a/empire-db-examples/empire-db-example-basic/config.xml
+++ b/empire-db-examples/empire-db-example-basic/config.xml
@@ -33,9 +33,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.hsql.DBMSHandlerHSql</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-hsqldb>
<properties-mysql>
@@ -47,9 +47,9 @@
<jdbcPwd>esteam</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.mysql.DBMSHandlerMySQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-mysql>
<properties-postgresql>
@@ -61,9 +61,9 @@
<jdbcPwd>DBSAMPLE</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-postgresql>
<properties-h2>
@@ -75,9 +75,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.h2.DBMSHandlerH2</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-h2>
<properties-derby>
@@ -89,9 +89,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.derby.DBMSHandlerDerby</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-derby>
<properties-oracle>
@@ -103,9 +103,9 @@
<jdbcPwd>DBSAMPLE</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.oracle.DBMSHandlerOracle</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-oracle>
<properties-sqlserver>
@@ -116,12 +116,12 @@
<jdbcPwd>jdbcPwd</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.sqlserver.DBMSHandlerMSSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
<useSequenceTable>false</useSequenceTable>
<!-- useDateTime2: set to false for databases using DATETIME for timestamps instead of DATETIME2 -->
<useDateTime2>true</useDateTime2>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-sqlserver>
<!-- log4j configuration node -->
diff --git a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
index 62895b6..b7009cc 100644
--- a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
+++ b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
@@ -211,7 +211,7 @@ public class SampleApp
DBMSHandler dbms = (DBMSHandler) Class.forName(dbmsHandlerClass).newInstance();
// Configure dbms
- config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperites");
+ config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperties");
// Special cases
if (dbms instanceof DBMSHandlerPostgreSQL)
diff --git a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
index 271fa94..00c4add 100644
--- a/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
+++ b/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/SampleApplication.java
@@ -169,7 +169,7 @@ public class SampleApplication extends WebApplication {
DBMSHandler dbms = (DBMSHandler) Class.forName(dbmsHandlerClass).newInstance();
// Configure dbms
- config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperites");
+ config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperties");
// done
return dbms;
diff --git a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml
index 0170ab3..ca6f2fb 100644
--- a/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml
+++ b/empire-db-examples/empire-db-example-jsf2/src/main/webapp/WEB-INF/config.xml
@@ -25,9 +25,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.hsql.DBMSHandlerHSql</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-hsqldb>
<properties-mysql>
@@ -39,9 +39,9 @@
<jdbcPwd>esteam</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.mysql.DBMSHandlerMySQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-mysql>
<properties-postgresql>
@@ -53,9 +53,9 @@
<jdbcPwd>postgres</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-postgresql>
<properties-h2>
@@ -67,9 +67,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.h2.DBMSHandlerH2</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-h2>
<properties-derby>
@@ -81,9 +81,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.derby.DBMSHandlerDerby</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-derby>
<properties-oracle>
@@ -95,9 +95,9 @@
<jdbcPwd>DBSAMPLE</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.oracle.DBMSHandlerOracle</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-oracle>
<properties-sqlserver>
@@ -108,12 +108,12 @@
<jdbcPwd>jdbcPwd</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.sqlserver.DBMSHandlerMSSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
<useSequenceTable>false</useSequenceTable>
<!-- useDateTime2: set to false for databases using DATETIME for timestamps instead of DATETIME2 -->
<useDateTime2>true</useDateTime2>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-sqlserver>
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
diff --git a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/app/SampleServiceApp.java b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/app/SampleServiceApp.java
index b4e078c..de45897 100644
--- a/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/app/SampleServiceApp.java
+++ b/empire-db-examples/empire-db-example-vue/src/main/java/org/apache/empire/rest/app/SampleServiceApp.java
@@ -128,7 +128,7 @@ public class SampleServiceApp
DBMSHandler dbms = (DBMSHandler) Class.forName(dbmsHandlerClass).newInstance();
// Configure dbms
- config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperites");
+ config.readProperties(dbms, "properties-"+provider, "dbmsHandlerProperties");
// done
return dbms;
diff --git a/empire-db-examples/empire-db-example-vue/src/main/webapp/WEB-INF/config.xml b/empire-db-examples/empire-db-example-vue/src/main/webapp/WEB-INF/config.xml
index 0170ab3..ca6f2fb 100644
--- a/empire-db-examples/empire-db-example-vue/src/main/webapp/WEB-INF/config.xml
+++ b/empire-db-examples/empire-db-example-vue/src/main/webapp/WEB-INF/config.xml
@@ -25,9 +25,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.hsql.DBMSHandlerHSql</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-hsqldb>
<properties-mysql>
@@ -39,9 +39,9 @@
<jdbcPwd>esteam</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.mysql.DBMSHandlerMySQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-mysql>
<properties-postgresql>
@@ -53,9 +53,9 @@
<jdbcPwd>postgres</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.postgresql.DBMSHandlerPostgreSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-postgresql>
<properties-h2>
@@ -67,9 +67,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.h2.DBMSHandlerH2</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-h2>
<properties-derby>
@@ -81,9 +81,9 @@
<jdbcPwd></jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.derby.DBMSHandlerDerby</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-derby>
<properties-oracle>
@@ -95,9 +95,9 @@
<jdbcPwd>DBSAMPLE</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.oracle.DBMSHandlerOracle</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<!-- no properties -->
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-oracle>
<properties-sqlserver>
@@ -108,12 +108,12 @@
<jdbcPwd>jdbcPwd</jdbcPwd>
<!-- Empire-db driver configuration -->
<dbmsHandlerClass>org.apache.empire.dbms.sqlserver.DBMSHandlerMSSQL</dbmsHandlerClass>
- <dbmsHandlerProperites>
+ <dbmsHandlerProperties>
<databaseName>DBSAMPLE</databaseName>
<useSequenceTable>false</useSequenceTable>
<!-- useDateTime2: set to false for databases using DATETIME for timestamps instead of DATETIME2 -->
<useDateTime2>true</useDateTime2>
- </dbmsHandlerProperites>
+ </dbmsHandlerProperties>
</properties-sqlserver>
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
index 344d343..d21f926 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/BeanListPageElement.java
@@ -630,7 +630,7 @@ public class BeanListPageElement<T> extends ListPageElement<T> implements ListIt
Set<Object[]> items = getSelectedItemKeys();
if (items.size()>0)
{
- DBColumn[] pk = (DBColumn[])rowset.getKeyColumns();
+ DBColumn[] pk = rowset.getKeyColumns();
DBColumnExpr keyExpr = pk[0];
for (int i=1; i<pk.length; i++)
{