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 8dcce49 [OPENMEETINGS-1856] some issues are addressed
8dcce49 is described below
commit 8dcce49320f84584e2531e0302a41722f235863b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Mar 22 11:38:46 2018 +0700
[OPENMEETINGS-1856] some issues are addressed
---
.../service/mail/template/AbstractTemplatePanel.java | 2 +-
.../mail/template/subject/RecordingExpiringTemplate.java | 2 +-
.../java/org/apache/openmeetings/web/common/MainPanel.java | 10 +++++-----
.../main/java/org/apache/openmeetings/web/pages/HashPage.java | 6 +++---
.../org/apache/openmeetings/web/pages/auth/SignInDialog.java | 2 +-
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
.../main/java/org/apache/openmeetings/web/user/chat/Chat.java | 2 +-
.../java/org/apache/openmeetings/web/user/chat/ChatForm.java | 6 +++---
.../org/apache/openmeetings/web/user/chat/ChatToolbar.java | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index b556835..54798a6 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@ -38,7 +38,7 @@ public abstract class AbstractTemplatePanel extends Panel {
protected final Locale locale;
@SpringBean
- protected IApplication app;
+ protected transient IApplication app;
protected AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
index db696b7..866ce83 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
@@ -38,7 +38,7 @@ public class RecordingExpiringTemplate extends
SubjectEmailTemplate {
private final User u;
@SpringBean
- protected RoomDao roomDao;
+ protected transient RoomDao roomDao;
private RecordingExpiringTemplate(User u, final Recording rec, long
remainingDays) {
super(LocaleHelper.getLocale(u));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index b72dbcd..54b2b31 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -121,15 +121,15 @@ public class MainPanel extends Panel {
};
@SpringBean
- private KurentoHandler kHandler;
+ private transient KurentoHandler kHandler;
@SpringBean
- private ClientManager clientManager;
+ private transient ClientManager clientManager;
@SpringBean
- private ConfigurationDao cfgDao;
+ private transient ConfigurationDao cfgDao;
@SpringBean
- private UserDao userDao;
+ private transient UserDao userDao;
@SpringBean
- private RoomDao roomDao;
+ private transient RoomDao roomDao;
public MainPanel(String id) {
this(id, null);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 532fc9d..3a527d5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -89,11 +89,11 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
private final PageParameters p;
@SpringBean
- private KurentoHandler kHandler;
+ private transient KurentoHandler kHandler;
@SpringBean
- private RoomDao roomDao;
+ private transient RoomDao roomDao;
@SpringBean
- private RecordingDao recDao;
+ private transient RecordingDao recDao;
public HashPage(PageParameters p) {
this.p = p;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index b9b2be8..1a2d078 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -92,7 +92,7 @@ public class SignInDialog extends NonClosableDialog<String> {
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
@SpringBean
- private ConfigurationDao cfgDao;
+ private transient ConfigurationDao cfgDao;
public SignInDialog(String id) {
super(id, "");
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 4b8a43a..3a56286 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -223,7 +223,7 @@ public class RoomPanel extends BasePanel {
Component eventDetail = new
WebMarkupContainer(EVENT_DETAILS_ID).setVisible(false);
@SpringBean
- private ClientManager cm;
+ private transient ClientManager cm;
public RoomPanel(String id, Room r) {
super(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 843e4ea..51dc5ef 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -231,7 +231,7 @@ public class RoomSidebar extends Panel {
private final Label userCount = new Label("user-count", Model.of(""));
@SpringBean
- private ClientManager cm;
+ private transient ClientManager cm;
public RoomSidebar(String id, final RoomPanel room) {
super(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 4b1616b..528d151 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -104,7 +104,7 @@ public class Chat extends Panel {
};
@SpringBean
- private ClientManager cm;
+ private transient ClientManager cm;
public Chat(String id) {
super(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
index 99c44b9..68e7f60 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatForm.java
@@ -65,6 +65,9 @@ public class ChatForm extends Form<Void> {
private static final Logger log =
LoggerFactory.getLogger(ChatForm.class);
private final HiddenField<String> activeTab = new
HiddenField<>("activeTab", Model.of(""));
+ @SpringBean
+ private transient ClientManager cm;
+
public ChatForm(String id) {
super(id);
final ChatToolbar toolbar = new ChatToolbar("toolbarContainer",
this);
@@ -145,9 +148,6 @@ public class ChatForm extends Form<Void> {
});
}
- @SpringBean
- private ClientManager cm;
-
private Client getClient() {
return findParent(MainPanel.class).getClient();
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index eab74c5..1933a49 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -140,7 +140,7 @@ public class ChatToolbar extends Panel implements
IWysiwygToolbar {
});
@SpringBean
- private ClientManager cm;
+ private transient ClientManager cm;
/**
* Constructor
--
To stop receiving notification emails like this one, please contact
[email protected].
