Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sun Sep 11 04:50:07 2016 @@ -1900,7 +1900,6 @@ <entry key="dashboard.widget.admin.desc">ÐÑновнÑе админиÑÑÑаÑивнÑе ÑÑкÑии</entry> <entry key="dashboard.widget.admin.cleanup.title">ÐÑÑÑÑ Ð¾ ÑÐ°Ð¹Ð»Ð°Ñ </entry> <entry key="dashboard.widget.admin.cleanup.show">ÐоказаÑÑ Ð¾ÑÑÑÑ Ð¾ ÑÐ°Ð¹Ð»Ð°Ñ </entry> - <entry key="dashboard.widget.admin.cleanup.temp">ÐÑеменнÑе ÑайлÑ:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Ðапка upload:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">пÑоÑили:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">не валиднÑе:</entry> @@ -1959,4 +1958,8 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sun Sep 11 04:50:07 2016 @@ -1864,7 +1864,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1923,4 +1922,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sun Sep 11 04:50:07 2016 @@ -1894,7 +1894,6 @@ <entry key="dashboard.widget.admin.desc">General Admin functions</entry> <entry key="dashboard.widget.admin.cleanup.title">Cleanup report</entry> <entry key="dashboard.widget.admin.cleanup.show">Show cleanup report</entry> - <entry key="dashboard.widget.admin.cleanup.temp">Temporary files:</entry> <entry key="dashboard.widget.admin.cleanup.upload">Upload folder:</entry> <entry key="dashboard.widget.admin.cleanup.profiles">profiles:</entry> <entry key="dashboard.widget.admin.cleanup.invalid">invalid:</entry> @@ -1953,4 +1952,6 @@ <entry key="network.test.upl.speed">Upload speed</entry> <entry key="access.denied.header">Access denied. You are not authorized to perform this action.</entry> <entry key="save.success">Saved successfully</entry> + <entry key="convert.errors.file">The have been errors while processing the file</entry> + <entry key="convert.errors.file.missing">File is not found</entry> </properties> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java Sun Sep 11 04:50:07 2016 @@ -23,9 +23,9 @@ import static org.apache.openmeetings.we import java.util.ArrayList; import java.util.List; -import org.apache.openmeetings.db.dao.record.RecordingLogDao; -import org.apache.openmeetings.db.entity.record.Recording; -import org.apache.openmeetings.db.entity.record.RecordingLog; +import org.apache.openmeetings.db.dao.file.FileItemLogDao; +import org.apache.openmeetings.db.entity.file.FileItem; +import org.apache.openmeetings.db.entity.file.FileItemLog; import org.apache.openmeetings.web.app.Application; import org.apache.wicket.AttributeModifier; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; @@ -39,19 +39,19 @@ import org.apache.wicket.model.Model; import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; -public class ConvertingErrorsDialog extends AbstractDialog<Recording> { +public class ConvertingErrorsDialog extends AbstractDialog<FileItem> { private static final long serialVersionUID = 1L; private final WebMarkupContainer container = new WebMarkupContainer("container"); private final Label message = new Label("message", Model.of((String)null)); - private final ListView<RecordingLog> logView = new ListView<RecordingLog>("row") { + private final ListView<FileItemLog> logView = new ListView<FileItemLog>("row") { private static final long serialVersionUID = 1L; @Override - protected void populateItem(ListItem<RecordingLog> item) { - RecordingLog l = item.getModelObject(); - item.add(new Label("exitCode", l.getExitValue())); - item.add(new Label("message", l.getFullMessage())); - if (!"0".equals(l.getExitValue())) { + protected void populateItem(ListItem<FileItemLog> item) { + FileItemLog l = item.getModelObject(); + item.add(new Label("exitCode")); + item.add(new Label("message")); + if (!l.isOk()) { item.add(AttributeModifier.replace("class", "alert")); } } @@ -72,21 +72,22 @@ public class ConvertingErrorsDialog exte return true; } - public ConvertingErrorsDialog(String id, IModel<Recording> model) { + public ConvertingErrorsDialog(String id, IModel<FileItem> model) { super(id, Application.getString(887), model); add(container.add(message.setVisible(false), logView.setVisible(false)).setOutputMarkupId(true)); } @Override protected void onOpen(IPartialPageRequestHandler handler) { - Recording f = getModelObject(); - List<RecordingLog> logs = getBean(RecordingLogDao.class).getByRecordingId(f.getId()); + FileItem f = getModelObject(); + setTitle(handler, Model.of(getString(f.getType() == FileItem.Type.Recording ? "887" : "convert.errors.file"))); + List<FileItemLog> logs = getBean(FileItemLogDao.class).get(f); if (f.getHash() == null) { message.setVisible(true); message.setDefaultModelObject(Application.getString(888)); } else if (!f.exists()) { message.setVisible(true); - message.setDefaultModelObject(Application.getString(1595)); + message.setDefaultModelObject(getString(f.getType() == FileItem.Type.Recording ? "1595" : "convert.errors.file.missing")); } else { message.setVisible(false); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemPanel.java Sun Sep 11 04:50:07 2016 @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.comm import static org.apache.openmeetings.web.app.Application.getBean; -import org.apache.openmeetings.db.dao.record.RecordingLogDao; +import org.apache.openmeetings.db.dao.file.FileItemLogDao; import org.apache.openmeetings.db.entity.file.FileItem; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.db.entity.record.Recording.Status; @@ -35,22 +35,24 @@ public class FileItemPanel extends Folde public FileItemPanel(String id, final IModel<? extends FileItem> model, final FileTreePanel fileTreePanel) { super(id, model, fileTreePanel); - if (model.getObject() instanceof Recording) { - Recording r = (Recording)model.getObject(); - long errorCount = getBean(RecordingLogDao.class).countErrors(r.getId()); - boolean visible = errorCount != 0 || (Status.RECORDING != r.getStatus() && Status.CONVERTING != r.getStatus() && !r.exists()); - errors.add(new AjaxEventBehavior("click") { - private static final long serialVersionUID = 1L; - - @Override - protected void onEvent(AjaxRequestTarget target) { - fileTreePanel.errorsDialog.setDefaultModel(model); - fileTreePanel.errorsDialog.open(target); - } - }).setVisible(visible); + FileItem f = model.getObject(); + long errorCount = getBean(FileItemLogDao.class).countErrors(f); + boolean visible = errorCount != 0; + if (FileItem.Type.Recording == f.getType()) { + Recording r = (Recording)f; + visible |= (Status.RECORDING != r.getStatus() && Status.CONVERTING != r.getStatus() && !f.exists()); } else { - errors.setVisible(false); + visible |= !f.exists(); } + errors.add(new AjaxEventBehavior("click") { + private static final long serialVersionUID = 1L; + + @Override + protected void onEvent(AjaxRequestTarget target) { + fileTreePanel.errorsDialog.setDefaultModel(model); + fileTreePanel.errorsDialog.open(target); + } + }).setVisible(visible); drag.add(errors); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java Sun Sep 11 04:50:07 2016 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.pages.auth; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -32,7 +33,6 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; @@ -171,7 +171,7 @@ public class SignInPage extends BaseInit result = result.replace("{$access_token}", clientToken); } if (redirectUri != null) { - result = result.replace("{$redirect_uri}", URLEncoder.encode(redirectUri, StandardCharsets.UTF_8.name())); + result = result.replace("{$redirect_uri}", URLEncoder.encode(redirectUri, UTF_8.name())); } if (code != null) { result = result.replace("{$code}", code); @@ -239,7 +239,7 @@ public class SignInPage extends BaseInit prepareConnection(urlConnection); urlConnection.setRequestMethod("POST"); urlConnection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - urlConnection.setRequestProperty("charset", StandardCharsets.UTF_8.name()); + urlConnection.setRequestProperty("charset", UTF_8.name()); urlConnection.setRequestProperty("Content-Length", String.valueOf(requestTokenParams.length())); urlConnection.setDoInput(true); urlConnection.setDoOutput(true); @@ -247,7 +247,7 @@ public class SignInPage extends BaseInit DataOutputStream paramsOutputStream = new DataOutputStream(urlConnection.getOutputStream()); paramsOutputStream.writeBytes(requestTokenParams); paramsOutputStream.flush(); - String sourceResponse = IOUtils.toString(urlConnection.getInputStream(), StandardCharsets.UTF_8); + String sourceResponse = IOUtils.toString(urlConnection.getInputStream(), UTF_8); // parse json result AuthInfo result = new AuthInfo(); try { @@ -307,10 +307,10 @@ public class SignInPage extends BaseInit // send request URLConnection connection = new URL(requestInfoUrl).openConnection(); prepareConnection(connection); - String sourceResponse = IOUtils.toString(connection.getInputStream(), StandardCharsets.UTF_8); - // parse json result - Map<String, String> result = new HashMap<String, String>(); - try { + String sourceResponse = IOUtils.toString(connection.getInputStream(), UTF_8); + // parse json result + Map<String, String> result = new HashMap<String, String>(); + try { JSONObject parsedJson = new JSONObject(sourceResponse); result.put("login", parsedJson.getString(loginAttributeName)); result.put("email", parsedJson.getString(emailAttributeName)); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.room; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE; import static org.apache.openmeetings.web.app.Application.getBean; @@ -101,6 +102,6 @@ public class RoomResourceReference exten @Override protected String getFileName(FileExplorerItem r) { - return preview ? r.getPreviewImage() : r.getName(); + return preview ? String.format("%s.%s", r.getName(), EXTENSION_JPG) : r.getName(); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java Sun Sep 11 04:50:07 2016 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.room.menu; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_ALLOW_REMOTE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW; @@ -31,7 +32,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.net.URI; -import java.nio.charset.StandardCharsets; import java.util.Properties; import org.apache.commons.codec.binary.Hex; @@ -89,7 +89,7 @@ public class StartSharingButton extends String app = ""; try (InputStream jnlp = getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) { ConfigurationDao cfgDao = getBean(ConfigurationDao.class); - app = IOUtils.toString(jnlp, StandardCharsets.UTF_8); + app = IOUtils.toString(jnlp, UTF_8); String baseUrl = cfgDao.getBaseUrl(); String publicSid = c.getUid(); Client rc = getClient(publicSid); @@ -130,7 +130,7 @@ public class StartSharingButton extends log.error("Unexpected error while creating jnlp file", e); } StringResourceStream srs = new StringResourceStream(app, "application/x-java-jnlp-file"); - srs.setCharset(StandardCharsets.UTF_8); + srs.setCharset(UTF_8); download.setResourceStream(srs); download.initiate(target); } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java Sun Sep 11 04:50:07 2016 @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.room import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -96,7 +97,8 @@ public class UploadDialog extends Abstra } }); form.add(feedback.setOutputMarkupId(true), toWb.setOutputMarkupId(true) - , cleanBlock.add(cleanWb.setOutputMarkupId(true)).setVisible(false).setOutputMarkupPlaceholderTag(true)); + , cleanBlock.add(cleanWb.setOutputMarkupId(true)).setVisible(false).setOutputMarkupPlaceholderTag(true)) + .setOutputMarkupId(true); form.setMultiPart(true); form.setMaxSize(Bytes.bytes(getBean(ConfigurationDao.class).getMaxUploadSize())); @@ -161,6 +163,9 @@ public class UploadDialog extends Abstra @Override protected void onOpen(IPartialPageRequestHandler handler) { super.onOpen(handler); + upload.setEnabled(true, handler); + uploadField.setModelObject(new ArrayList<>()); + handler.add(form, fileName); handler.appendJavaScript(String.format("bindUpload('%s', '%s');", form.getMarkupId(), fileName.getMarkupId())); } @@ -192,7 +197,8 @@ public class UploadDialog extends Abstra ConverterProcessResultList result = getBean(FileProcessor.class).processFile(getUserId(), f, fu.getInputStream()); room.getSidebar().updateFiles(target); if (result.hasError()) { - error(result.getLogMessage()); + form.error(getString("convert.errors.file")); + onError(target); } else { if (toWb.getModelObject()) { room.sendFileToWb(f, cleanWb.getModelObject()); @@ -200,7 +206,8 @@ public class UploadDialog extends Abstra close(target, null); } } catch (Exception e) { - error(e.getMessage()); + form.error(e.getMessage()); + onError(target); } } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html Sun Sep 11 04:50:07 2016 @@ -24,7 +24,6 @@ <div class="ui-widget-content ui-corner-all"> <div wicket:id="feedback"></div> <ul wicket:id="container"> - <li><div wicket:id="temp"></div></li> <li><span><wicket:message key="dashboard.widget.admin.cleanup.upload"/></span> <span wicket:id="upload-size"></span> <ul> <li><div wicket:id="profile"></div></li> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java Sun Sep 11 04:50:07 2016 @@ -23,7 +23,6 @@ import static org.apache.openmeetings.cl import static org.apache.openmeetings.cli.CleanupHelper.getImportUnit; import static org.apache.openmeetings.cli.CleanupHelper.getProfileUnit; import static org.apache.openmeetings.cli.CleanupHelper.getRecUnit; -import static org.apache.openmeetings.cli.CleanupHelper.getTempUnit; import static org.apache.openmeetings.util.OmFileHelper.getHumanSize; import static org.apache.openmeetings.util.OmFileHelper.getStreamsDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadDir; @@ -49,7 +48,6 @@ import com.googlecode.wicket.kendo.ui.pa public class AdminCleanupInfoDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; - private final CleanupUnitPanel temp; private final Label uploadSize; private final CleanupEntityUnitPanel profile; private final CleanupUnitPanel imp; @@ -62,7 +60,6 @@ public class AdminCleanupInfoDialog exte public AdminCleanupInfoDialog(String id) { super(id, ""); - temp = new CleanupUnitPanel("temp", "dashboard.widget.admin.cleanup.temp", new CleanupUnit()); uploadSize = new Label("upload-size", ""); profile = new CleanupEntityUnitPanel("profile", "dashboard.widget.admin.cleanup.profiles", new CleanupEntityUnit()); imp = new CleanupUnitPanel("import", "dashboard.widget.admin.cleanup.import", new CleanupUnit()); @@ -72,7 +69,7 @@ public class AdminCleanupInfoDialog exte fin = new CleanupEntityUnitPanel("final", "dashboard.widget.admin.cleanup.final", new CleanupEntityUnit()); add(feedback.setOutputMarkupId(true)); - add(container.add(temp, uploadSize, profile, imp, backup, files, streamsSize, fin).setOutputMarkupId(true)); + add(container.add(uploadSize, profile, imp, backup, files, streamsSize, fin).setOutputMarkupId(true)); add(new Form<Void>("form") { private static final long serialVersionUID = 1L; @@ -110,7 +107,6 @@ public class AdminCleanupInfoDialog exte } private void update(AjaxRequestTarget target) { - temp.setDefaultModelObject(getTempUnit()); uploadSize.setDefaultModelObject(getHumanSize(getUploadDir())); profile.setDefaultModelObject(getProfileUnit(getBean(UserDao.class))); imp.setDefaultModelObject(getImportUnit()); @@ -128,7 +124,6 @@ public class AdminCleanupInfoDialog exte public void cleanup(AjaxRequestTarget target) { try { - ((CleanupUnit)temp.getDefaultModelObject()).cleanup(); ((CleanupEntityUnit)profile.getDefaultModelObject()).cleanup(); ((CleanupUnit)imp.getDefaultModelObject()).cleanup(); ((CleanupUnit)backup.getDefaultModelObject()).cleanup(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/AviRecordingResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,7 +18,8 @@ */ package org.apache.openmeetings.web.user.record; -import static org.apache.openmeetings.util.OmFileHelper.getRecording; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI; +import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; import java.io.File; @@ -38,11 +39,11 @@ public class AviRecordingResourceReferen @Override protected String getFileName(Recording r) { - return r.getAlternateDownload(); + return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_AVI); } @Override protected File getFile(Recording r) { - return getRecording(r.getAlternateDownload()); + return r.getFile(EXTENSION_AVI); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/FlvRecordingResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,8 +18,9 @@ */ package org.apache.openmeetings.web.user.record; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV; import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE; -import static org.apache.openmeetings.util.OmFileHelper.getRecording; +import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; import java.io.File; @@ -31,19 +32,19 @@ public class FlvRecordingResourceReferen public FlvRecordingResourceReference() { super("flv-recording"); } - + @Override public String getMimeType() { return FLV_MIME_TYPE; } - + @Override protected String getFileName(Recording r) { - return r.getHash(); + return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_FLV); } - + @Override protected File getFile(Recording r) { - return getRecording(r.getHash()); + return r.getFile(EXTENSION_FLV); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/JpgRecordingResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,8 +18,9 @@ */ package org.apache.openmeetings.web.user.record; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; -import static org.apache.openmeetings.util.OmFileHelper.getRecording; +import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; import java.io.File; @@ -31,19 +32,19 @@ public class JpgRecordingResourceReferen public JpgRecordingResourceReference() { super("jpg-recording-cover"); } - + @Override public String getMimeType() { return JPG_MIME_TYPE; } - + @Override protected String getFileName(Recording r) { - return r.getPreviewImage(); + return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_JPG); } - + @Override protected File getFile(Recording r) { - return getRecording(r.getPreviewImage()); + return r.getFile(EXTENSION_JPG); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,7 +18,9 @@ */ package org.apache.openmeetings.web.user.record; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE; +import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; import java.io.File; @@ -30,17 +32,17 @@ public class Mp4RecordingResourceReferen public Mp4RecordingResourceReference() { super("mp4-recording"); } - + @Override public String getMimeType() { return MP4_MIME_TYPE; } - + @Override protected String getFileName(Recording r) { - return r.getFile().getName(); + return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_MP4); } - + @Override protected File getFile(Recording r) { return r.getFile(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java Sun Sep 11 04:50:07 2016 @@ -18,8 +18,8 @@ */ package org.apache.openmeetings.web.user.record; -import static org.apache.openmeetings.util.OmFileHelper.OGG_EXTENSION; -import static org.apache.openmeetings.util.OmFileHelper.getOggRecording; +import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG; +import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; import java.io.File; @@ -39,11 +39,11 @@ public class OggRecordingResourceReferen @Override protected String getFileName(Recording r) { - return r.getHash() + OGG_EXTENSION; + return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_OGG); } @Override protected File getFile(Recording r) { - return getOggRecording(r.getHash()); + return r.getFile(EXTENSION_OGG); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java Sun Sep 11 04:50:07 2016 @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.web.util; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.openmeetings.util.OmFileHelper.getUserDashboard; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.web.app.WebSession.getUserId; @@ -26,7 +27,6 @@ import static org.red5.logging.Red5Logge import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.nio.charset.StandardCharsets; import java.util.Collections; import org.slf4j.Logger; @@ -57,9 +57,9 @@ public class UserDashboardPersister impl public XStreamDashboardPersister() { this.file = getUserDashboard(getUserId()); - xstream = new XStream(new DomDriver(StandardCharsets.UTF_8.name())); - xstream.setMode(XStream.NO_REFERENCES); - xstream.alias("dashboard", UserDashboard.class); + xstream = new XStream(new DomDriver(UTF_8.name())); + xstream.setMode(XStream.NO_REFERENCES); + xstream.alias("dashboard", UserDashboard.class); } @Override Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Sun Sep 11 04:50:07 2016 @@ -39,7 +39,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -59,6 +58,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Sun Sep 11 04:50:07 2016 @@ -39,7 +39,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -59,6 +58,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Sun Sep 11 04:50:07 2016 @@ -38,7 +38,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -58,6 +57,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Sun Sep 11 04:50:07 2016 @@ -39,7 +39,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -59,6 +58,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Sun Sep 11 04:50:07 2016 @@ -39,7 +39,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -59,6 +58,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Sun Sep 11 04:50:07 2016 @@ -39,7 +39,6 @@ <class>org.apache.openmeetings.db.entity.user.Group</class> <class>org.apache.openmeetings.db.entity.user.GroupUser</class> <class>org.apache.openmeetings.db.entity.record.Recording</class> - <class>org.apache.openmeetings.db.entity.record.RecordingLog</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaData</class> <class>org.apache.openmeetings.db.entity.record.RecordingMetaDelta</class> <class>org.apache.openmeetings.db.entity.room.Invitation</class> @@ -59,6 +58,7 @@ <class>org.apache.openmeetings.db.entity.user.Userdata</class> <class>org.apache.openmeetings.db.entity.user.User</class> <class>org.apache.openmeetings.db.entity.file.FileItem</class> + <class>org.apache.openmeetings.db.entity.file.FileItemLog</class> <class>org.apache.openmeetings.db.entity.file.FileExplorerItem</class> <class>org.apache.openmeetings.db.entity.user.AsteriskSipUser</class> <class>org.apache.openmeetings.db.entity.server.OAuthServer</class> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Sun Sep 11 04:50:07 2016 @@ -213,9 +213,9 @@ <bean id="roomGroupDao" class="org.apache.openmeetings.db.dao.room.RoomGroupDao"/> <bean id="conferenceLogDao" class="org.apache.openmeetings.db.dao.log.ConferenceLogDao" /> <bean id="emailManagement" class="org.apache.openmeetings.service.mail.EmailManager" /> + <bean id="fileItemLogDao" class="org.apache.openmeetings.db.dao.file.FileItemLogDao" /> <bean id="fileExplorerItemDao" class="org.apache.openmeetings.db.dao.file.FileExplorerItemDao" /> <bean id="recordingDao" class="org.apache.openmeetings.db.dao.record.RecordingDao" /> - <bean id="recordingLogDao" class="org.apache.openmeetings.db.dao.record.RecordingLogDao" /> <bean id="recordingMetaDataDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDataDao" /> <bean id="recordingMetaDeltaDao" class="org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao" /> <bean id="ldapConfigDao" class="org.apache.openmeetings.db.dao.server.LdapConfigDao" /> Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1760224&r1=1760223&r2=1760224&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/web.xml Sun Sep 11 04:50:07 2016 @@ -66,7 +66,7 @@ </init-param> <init-param> <param-name>ignorePaths</param-name> - <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services</param-value> + <param-value>conf,css,default,docs,images,js,persistence,public,screenshare,streams,upload,services</param-value> </init-param> </filter> <filter-mapping>
