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 e524760 [OPENMEETINGS-2177] more backup improvements
e524760 is described below
commit e524760719cf9c8de775f819aa0a616c83ed19ca
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Mar 7 15:00:13 2020 +0700
[OPENMEETINGS-2177] more backup improvements
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 4 ++--
.../src/test/java/org/apache/openmeetings/backup/TestExport.java | 3 ++-
pom.xml | 6 ------
3 files changed, 4 insertions(+), 9 deletions(-)
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 86a9bcc..7cbe33a 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
@@ -1136,12 +1136,12 @@ public class BackupImport {
if (EXTENSION_PNG.equals(ext)) {
Long id = getPrefixedId(GROUP_LOGO_PREFIX, f,
groupMap);
if (id != null) {
- FileUtils.moveFile(f, getGroupLogo(id,
false));
+ FileUtils.copyFile(f, getGroupLogo(id,
false));
}
} else if (EXTENSION_CSS.equals(ext)) {
Long id = getPrefixedId(GROUP_CSS_PREFIX, f,
groupMap);
if (id != null) {
- FileUtils.moveFile(f, getGroupCss(id,
false));
+ FileUtils.copyFile(f, getGroupCss(id,
false));
}
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index 0c08ab2..0e8ea74 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -30,6 +30,7 @@ import javax.xml.bind.Marshaller;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
@@ -58,6 +59,6 @@ public class TestExport extends AbstractJUnitDefaults {
});
StringWriter writer = new StringWriter();
marshaller.marshal(u, writer);
- System.err.println(writer.getBuffer());
+ Assertions.assertNotNull(writer.getBuffer());
}
}
diff --git a/pom.xml b/pom.xml
index 17ea926..6e00e51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -387,12 +387,6 @@
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
- <repository>
- <id>openmeetings-bintray</id>
- <url>https://dl.bintray.com/openmeetings/maven</url>
- <releases><enabled>true</enabled></releases>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
