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 2018/08/09 07:28:16 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1897] ical4j,
selenium, postgresql, dom4j, commons-collections4,
api-all are updated test-backup 4.0.4 is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 950a08d [OPENMEETINGS-1897] ical4j, selenium, postgresql, dom4j, commons-collections4, api-all are updated test-backup 4.0.4 is added
950a08d is described below
commit 950a08def102b4919f23c6a400a4e6c365280ad8
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Aug 9 14:27:36 2018 +0700
[OPENMEETINGS-1897] ical4j, selenium, postgresql, dom4j, commons-collections4, api-all are updated test-backup 4.0.4 is added
---
.../apache/openmeetings/core/ldap/LdapLoginManager.java | 4 ++--
.../apache/openmeetings/db/entity/server/LdapConfig.java | 6 +++---
.../org/apache/openmeetings/backup/BackupImport.java | 16 ++++++++++------
openmeetings-web/pom.xml | 6 ++++++
.../org/apache/openmeetings/backup/TestOldBackups.java | 10 ++++++++++
pom.xml | 12 ++++++------
6 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index ef1a333..1ccdfbd 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -384,8 +384,8 @@ public class LdapLoginManager {
if (GroupMode.ATTRIBUTE == options.groupMode) {
Attribute attr = getAttr(config, entry, CONFIGKEY_LDAP_KEY_GROUP, LDAP_KEY_GROUP);
if (attr != null) {
- for (Value<?> v : attr) {
- groups.add(new Dn(v.getString()));
+ for (Value v : attr) {
+ groups.add(new Dn(v.getValue()));
}
}
} else if (GroupMode.QUERY == options.groupMode) {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
index 7b467f4..ef89083 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/LdapConfig.java
@@ -54,7 +54,7 @@ public class LdapConfig extends HistoricalEntity {
private Long id;
@Column(name = "name")
- @Element(data = true)
+ @Element(data = true, required = false)
private String name;
@Column(name = "config_file_name")
@@ -62,7 +62,7 @@ public class LdapConfig extends HistoricalEntity {
private String configFileName;
@Column(name = "add_domain_to_user_name", nullable = false)
- @Element(data = true)
+ @Element(data = true, required = false)
private boolean addDomainToUserName;
@Column(name = "domain")
@@ -70,7 +70,7 @@ public class LdapConfig extends HistoricalEntity {
private String domain;
@Column(name = "is_active", nullable = false)
- @Element(data = true, name = "isActive")
+ @Element(data = true, name = "isActive", required = false)
private boolean active;
@ManyToOne(fetch = FetchType.EAGER)
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 9bb54ca..ec5ba1b 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -498,12 +498,16 @@ public class BackupImport {
Long defaultLdapId = cfgDao.getLong(CONFIG_DEFAULT_LDAP_ID, null);
List<LdapConfig> list = readList(simpleSerializer, f, "ldapconfigs.xml", "ldapconfigs", LdapConfig.class);
for (LdapConfig c : list) {
- if (!"local DB [internal]".equals(c.getName())) {
- c.setId(null);
- c = ldapConfigDao.update(c, null);
- if (defaultLdapId == null) {
- defaultLdapId = c.getId();
- }
+ if (Strings.isEmpty(c.getName())) {
+ continue;
+ }
+ if ("local DB [internal]".equals(c.getName())) {
+ continue;
+ }
+ c.setId(null);
+ c = ldapConfigDao.update(c, null);
+ if (defaultLdapId == null) {
+ defaultLdapId = c.getId();
}
}
return defaultLdapId;
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index db6c466..73c85f5 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -376,6 +376,12 @@
<version>3.3.0</version>
<type>zip</type>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>test-backup</artifactId>
+ <version>4.0.4</version>
+ <type>zip</type>
+ </artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
index 6d6f809..cfb1faf 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java
@@ -19,6 +19,10 @@
package org.apache.openmeetings.backup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getCryptClassName;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -65,6 +69,12 @@ public class TestOldBackups extends AbstractJUnitDefaults {
assertNotNull("Not null config should be returned", cfg);
cfg.setValue(cryptClass);
cfgDao.update(cfg, null);
+ for (String key : new String[] {CONFIG_PATH_IMAGEMAGIC, CONFIG_PATH_FFMPEG, CONFIG_PATH_OFFICE, CONFIG_PATH_SOX}) {
+ Configuration c = cfgDao.get(key);
+ assertNotNull("Not null config should be returned", c);
+ c.setValue("");
+ cfgDao.update(c, null);
+ }
}
@Test
diff --git a/pom.xml b/pom.xml
index 473cadf..e198f62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,9 +78,9 @@
<spring.version>5.0.8.RELEASE</spring.version>
<mina.version>2.0.19</mina.version>
<tomcat.version>9.0.10</tomcat.version>
- <ical4j.version>2.2.0</ical4j.version>
+ <ical4j.version>3.0.1</ical4j.version>
<cxf.version>3.2.5</cxf.version>
- <selenium.version>3.13.0</selenium.version>
+ <selenium.version>3.14.0</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.4.0</jettison.version>
<site.basedir>${project.basedir}</site.basedir>
@@ -93,17 +93,17 @@
<commons-dbcp.version>2.5.0</commons-dbcp.version>
<commons-pool.version>1.6</commons-pool.version> <!-- required by OpenJPA for clustering -->
<commons-pool2.version>2.6.0</commons-pool2.version>
- <postgresql.version>42.2.2</postgresql.version>
+ <postgresql.version>42.2.4</postgresql.version>
<commons-cli.version>1.4</commons-cli.version>
- <dom4j.version>2.1.0</dom4j.version>
+ <dom4j.version>2.1.1</dom4j.version>
<commons-codec.version>1.11</commons-codec.version>
<commons-io.version>2.6</commons-io.version>
<mysql.version>8.0.11</mysql.version>
<mssql.version>6.2.1.jre8</mssql.version>
<pdfbox.version>2.0.11</pdfbox.version>
- <commons-collections4.version>4.1</commons-collections4.version>
+ <commons-collections4.version>4.2</commons-collections4.version>
<xstream.version>1.4.10</xstream.version>
- <api-all.version>1.0.2</api-all.version>
+ <api-all.version>2.0.0.AM1</api-all.version>
<caldav4j.version>0.9.1</caldav4j.version>
<tika-parsers.version>1.18</tika-parsers.version>
<commons-text.version>1.4</commons-text.version>