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 de56d35 [OPENMEETINGS-2151] build should be fixed
de56d35 is described below
commit de56d35a32ae6fb3f9fbda283bcaab68c3c4e90a
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Apr 7 10:43:02 2020 +0700
[OPENMEETINGS-2151] build should be fixed
---
.../apache/openmeetings/web/app/Application.java | 29 ++++++++--------------
.../apache/openmeetings/web/app/ClientManager.java | 2 +-
.../openmeetings/web/app/QuickPollManager.java | 2 +-
.../openmeetings/web/app/WhiteboardManager.java | 2 +-
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 1 +
5 files changed, 15 insertions(+), 21 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 ab47770..74fc3d7 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
@@ -136,14 +136,13 @@ import org.wicketstuff.dashboard.web.DashboardSettings;
import org.wicketstuff.datastores.hazelcast.HazelcastDataStore;
import
com.googlecode.wicket.jquery.ui.plugins.wysiwyg.settings.WysiwygLibrarySettings;
+import com.hazelcast.cluster.Member;
+import com.hazelcast.cluster.MembershipEvent;
+import com.hazelcast.cluster.MembershipListener;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MemberAttributeEvent;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
+import com.hazelcast.topic.ITopic;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.BootstrapSettings;
@@ -196,13 +195,12 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
getComponentInstantiationListeners().add(new
SpringComponentInjector(this, ctx, true));
serverId = hazelcast.getName();
-
hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY,
serverId);
hazelcast.getCluster().getMembers().forEach(m -> {
- cm.serverAdded(m.getStringAttribute(NAME_ATTR_KEY),
m.getStringAttribute(SERVER_URL_ATTR_KEY));
+ cm.serverAdded(m.getAttribute(NAME_ATTR_KEY),
m.getAttribute(SERVER_URL_ATTR_KEY));
});
hazelWsTopic = hazelcast.getTopic("default");
hazelWsTopic.addMessageListener(msg -> {
- String mServerId =
msg.getPublishingMember().getStringAttribute(NAME_ATTR_KEY);
+ String mServerId =
msg.getPublishingMember().getAttribute(NAME_ATTR_KEY);
if (mServerId.equals(serverId)) {
return;
}
@@ -219,13 +217,13 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
@Override
public void memberRemoved(MembershipEvent evt) {
//server down, need to remove all online
clients, process persistent addresses
- String serverId =
evt.getMember().getStringAttribute(NAME_ATTR_KEY);
+ String serverId =
evt.getMember().getAttribute(NAME_ATTR_KEY);
cm.serverRemoved(serverId);
updateJpaAddresses();
}
@Override
- public void memberAttributeChanged(MemberAttributeEvent
evt) {
+ public void memberAdded(MembershipEvent evt) {
//no-op
//server added, need to process persistent
addresses
updateJpaAddresses();
@@ -235,21 +233,16 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
if
(evt.getMember().getUuid().equals(m.getUuid())) {
continue;
}
- String serverId =
m.getStringAttribute(NAME_ATTR_KEY);
+ String serverId =
m.getAttribute(NAME_ATTR_KEY);
names.add(serverId);
}
- String newServerId =
evt.getMember().getStringAttribute(NAME_ATTR_KEY);
+ String newServerId =
evt.getMember().getAttribute(NAME_ATTR_KEY);
log.warn("Name added: {}", newServerId);
- cm.serverAdded(newServerId,
evt.getMember().getStringAttribute(SERVER_URL_ATTR_KEY));
+ cm.serverAdded(newServerId,
evt.getMember().getAttribute(SERVER_URL_ATTR_KEY));
if (names.contains(newServerId)) {
log.warn("Duplicate cluster instance
with name {} found {}", newServerId, evt.getMember());
}
}
-
- @Override
- public void memberAdded(MembershipEvent evt) {
- //no-op due to name is not set
- }
});
setPageManagerProvider(new DefaultPageManagerProvider(this) {
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index 8ecf8ce..0ecad1f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -55,7 +55,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.hazelcast.core.EntryEvent;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import com.hazelcast.map.listener.EntryAddedListener;
import com.hazelcast.map.listener.EntryRemovedListener;
import com.hazelcast.map.listener.EntryUpdatedListener;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
index 4c9f8d8..8332362 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.github.openjson.JSONObject;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
@Component
public class QuickPollManager {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index e9b50e9..01cc78a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -56,7 +56,7 @@ import org.springframework.stereotype.Component;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
import com.hazelcast.core.EntryEvent;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
import com.hazelcast.map.listener.EntryAddedListener;
import com.hazelcast.map.listener.EntryRemovedListener;
import com.hazelcast.map.listener.EntryUpdatedListener;
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 4103181..b924412 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -74,6 +74,7 @@
</map>
<instance-name>server-1</instance-name><!-- MAKE SURE THIS ONE IS
UNIQUE -->
<member-attributes>
+ <attribute name="name">server-1</attribute><!-- MAKE SURE THIS
ONE IS SAME AS ABOVE -->
<attribute
name="server.url">https://127.0.0.1:5443/openmeetings</attribute><!-- MAKE SURE
THIS PUBLIC SERVER ADDRESS, USE IP with care: certificate may be not valid for
IP -->
</member-attributes>
<network>
