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 2020/10/14 13:06:17 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2476]
InterruptedException is re-thrown, internal error page is changed
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 bfdacc3 [OPENMEETINGS-2476] InterruptedException is re-thrown, internal error page is changed
bfdacc3 is described below
commit bfdacc3fdb6597eedf71f54248efca223893ca52
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Oct 14 20:06:02 2020 +0700
[OPENMEETINGS-2476] InterruptedException is re-thrown, internal error page is changed
---
.../apache/openmeetings/web/app/Application.java | 4 ++
.../web/app/Application.properties.xml | 2 +
.../web/app/Application_ar.properties.xml | 2 +
.../web/app/Application_bg.properties.xml | 2 +
.../web/app/Application_bn.properties.xml | 2 +
.../web/app/Application_ca.properties.xml | 2 +
.../web/app/Application_cs.properties.xml | 2 +
.../web/app/Application_da.properties.xml | 2 +
.../web/app/Application_de.properties.xml | 2 +
.../web/app/Application_el.properties.xml | 2 +
.../web/app/Application_es.properties.xml | 2 +
.../web/app/Application_fa.properties.xml | 2 +
.../web/app/Application_fi.properties.xml | 2 +
.../web/app/Application_fr.properties.xml | 2 +
.../web/app/Application_gl.properties.xml | 2 +
.../web/app/Application_hi.properties.xml | 2 +
.../web/app/Application_hu.properties.xml | 2 +
.../web/app/Application_in.properties.xml | 2 +
.../web/app/Application_it.properties.xml | 2 +
.../web/app/Application_iw.properties.xml | 2 +
.../web/app/Application_ja.properties.xml | 2 +
.../web/app/Application_ko.properties.xml | 2 +
.../web/app/Application_lo.properties.xml | 2 +
.../web/app/Application_nl.properties.xml | 2 +
.../web/app/Application_pl.properties.xml | 2 +
.../web/app/Application_pt.properties.xml | 2 +
.../web/app/Application_pt_BR.properties.xml | 2 +
.../web/app/Application_ru.properties.xml | 2 +
.../web/app/Application_sk.properties.xml | 2 +
.../web/app/Application_sv.properties.xml | 2 +
.../web/app/Application_ta.properties.xml | 2 +
.../web/app/Application_th.properties.xml | 2 +
.../web/app/Application_tr.properties.xml | 2 +
.../web/app/Application_uk.properties.xml | 2 +
.../web/app/Application_zh_CN.properties.xml | 2 +
.../web/app/Application_zh_TW.properties.xml | 2 +
.../openmeetings/web/pages/InternalErrorPage.html | 36 +++++++++++++++
.../openmeetings/web/pages/InternalErrorPage.java | 52 ++++++++++++++++++++++
.../openmeetings/web/pages/auth/SignInPage.java | 6 +--
39 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 87b2a85..ac4c389 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -68,6 +68,7 @@ import org.apache.openmeetings.util.ws.IClusterWsMessage;
import org.apache.openmeetings.web.pages.AccessDeniedPage;
import org.apache.openmeetings.web.pages.ActivatePage;
import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.openmeetings.web.pages.InternalErrorPage;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.pages.NotInitedPage;
import org.apache.openmeetings.web.pages.PrivacyPage;
@@ -118,6 +119,7 @@ import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.apache.wicket.settings.ExceptionSettings;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.validator.UrlValidator;
@@ -189,6 +191,8 @@ public class Application extends AuthenticatedWebApplication implements IApplica
setWicketApplicationName(super.getName());
getSecuritySettings().setAuthenticationStrategy(new OmAuthenticationStrategy());
getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
+ getApplicationSettings().setInternalErrorPage(InternalErrorPage.class);
+ getExceptionSettings().setUnexpectedExceptionDisplay(ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE);
getComponentInstantiationListeners().add(new SpringComponentInjector(this, ctx, true));
Config cfg = new XmlConfigBuilder().build();
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 0cef9b6..4244d20 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 2cf9aa0..d22b79b 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[انقر لإرساء اللوحة]]></entry>
<entry key="label.undock.panel"><![CDATA[انقر لإلغاء قفل اللوحة]]></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 d915f06..2a52bf1 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 efa20db..ccc1d4d 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 c148380..652a5cf 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 bd68463..0567769 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 50d584f..2508166 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 a64387e..f4ea10b 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
@@ -829,6 +829,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Fehlerhafter Hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Klicken, um das Panel anzudocken]]></entry>
<entry key="label.undock.panel"><![CDATA[Klicken, um das Panel abzudocken]]></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 282128b..eeb2aa0 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 64b6497..b7a5496 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
@@ -822,6 +822,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Hash inválido]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 55e82fc..398c291 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
@@ -820,6 +820,8 @@ target="_blank">Custom Crypt Mechanism</a>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[هش نا معتبر]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 979ecb9..b521610 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 93f67cc..10cf20f 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
@@ -824,6 +824,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 83dd30c..6f61fff 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
index d646ab5..bff8613 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 7427406..f1a66d0 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
@@ -812,6 +812,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 02ada33..9d2368d 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 2106258..0496457 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
@@ -825,6 +825,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Hash invalido]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
index 1533236..650b230 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
@@ -824,6 +824,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 3c13bba..fd1dfd8 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
@@ -824,6 +824,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[不正なハッシュ]]></entry>
<entry key="label.dock.panel"><![CDATA[クリックしてパネルを連結する]]></entry>
<entry key="label.undock.panel"><![CDATA[クリックしてパネルを切り離す]]></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 8dd7e41..0977bd8 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
index efd02cb..86574e9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 d26a628..4f7ed7d 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 b4bbcf8..1cc3c35 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Kliknij, aby zadokować panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Kliknij, aby oddokować panel]]></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 d356f21..3482b34 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 c92fb43..c5d687e 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 5025c5d..b0b2c7b 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
@@ -824,6 +824,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[К сожалению что-то поломалось :(, <br/>
+пожалуйста проверьте <tt>openmeetings.log</tt> и свяжитесь с разработчиками OpenMeetings]]></entry>
<entry key="invalid.hash"><![CDATA[Неверный код]]></entry>
<entry key="label.dock.panel"><![CDATA[Кликните чтобы "прилепить" панель]]></entry>
<entry key="label.undock.panel"><![CDATA[Кликните чтобы "отлепить" панель]]></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 219cff9..9281fda 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 55c800a..94b0e3c 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
@@ -821,6 +821,8 @@ till dess kan bli oanvändbara.
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
index d7502ba..8d4190b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
@@ -825,6 +825,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 5efb9d2..642a4e3 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 6df771a..9bbb93e 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 abbba32..8ac8d27 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Натисніть щоб відокремити панель]]></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 8210324..8bfe6b7 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
@@ -824,6 +824,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></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 3d0db59..f289e3f 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
@@ -823,6 +823,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<br />
]]></entry>
+ <entry key="internal.error"><![CDATA[Unfortunately something bad just happen :(, <br/>
+please check <tt>openmeetings.log</tt> and contact OpenMeetings developers]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.html
new file mode 100644
index 0000000..85c3ee8
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.html
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
+<wicket:extend>
+ <div class="access-denied outer">
+ <div class="border text-danger inner">
+ <div>
+ <h2><wicket:message key="internal.error"/></h2>
+ </div>
+ <div class="centered">
+ <form wicket:id="form">
+ <button wicket:id="home"></button>
+ </form>
+ </div>
+ </div>
+ </div>
+</wicket:extend>
+</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
new file mode 100644
index 0000000..939b5d1
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InternalErrorPage.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.pages;
+
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.request.IRequestParameters;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapButton;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+
+public class InternalErrorPage extends BaseInitedPage {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Form<Void>("form").add(
+ new BootstrapButton("home", new ResourceModel("124"), Buttons.Type.Outline_Primary) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onSubmit() {
+ setResponsePage(Application.get().getHomePage());
+ }
+ })
+ );
+ }
+
+ @Override
+ protected void onParameterArrival(IRequestParameters requestParameters, AjaxRequestTarget target) {
+ //no-op
+ }
+}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index b26cd30..cadb32e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -115,11 +115,11 @@ public class SignInPage extends BaseInitedPage {
@SpringBean
private OAuth2Dao oauthDao;
- public SignInPage() {
+ public SignInPage() throws InterruptedException {
this(new PageParameters());
}
- public SignInPage(PageParameters p) {
+ public SignInPage(PageParameters p) throws InterruptedException {
super();
WebSession.get().checkToken(p.get(TOKEN_PARAM));
if (WebSession.get().isSignedIn()) {
@@ -143,7 +143,7 @@ public class SignInPage extends BaseInitedPage {
} else {
log.error("Failed to login via OAuth2!");
}
- } catch (IOException|NoSuchAlgorithmException|InterruptedException|JSONException e) {
+ } catch (IOException|NoSuchAlgorithmException|JSONException e) {
log.error("OAuth2 login error", e);
}
}