Repository: openmeetings Updated Branches: refs/heads/3.3.x cd13398cd -> cb0a60b9a
[OPENMEETINGS-1677] hazelcast version is updated Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/cb0a60b9 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/cb0a60b9 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/cb0a60b9 Branch: refs/heads/3.3.x Commit: cb0a60b9a26d2c4fe81d7bfd405e67d2112d2fdb Parents: cd13398 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jul 31 20:37:00 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jul 31 20:37:00 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/app/Application.java | 8 ++++++-- pom.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb0a60b9/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- 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 25a5516..bc0c578 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 @@ -128,6 +128,7 @@ import org.wicketstuff.datastores.hazelcast.HazelcastDataStore; import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.Member; +import com.hazelcast.core.MemberAttributeEvent; import com.hazelcast.core.MembershipEvent; import com.hazelcast.core.MembershipListener; @@ -167,6 +168,10 @@ public class Application extends AuthenticatedWebApplication implements IApplica } @Override + public void memberAttributeChanged(MemberAttributeEvent arg0) { + } + + @Override public void memberAdded(MembershipEvent membershipEvent) { //server added, need to process persistent addresses updateJpaAddresses(_getBean(ConfigurationDao.class)); @@ -221,7 +226,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica // add dashboard context injector getComponentInstantiationListeners().add(new DashboardContextInjector(dashboardContext)); DashboardSettings dashboardSettings = DashboardSettings.get(); - dashboardSettings.setIncludeJQuery(false); dashboardSettings.setIncludeJQueryUI(false); getRootRequestMapperAsCompound().add(new NoVersionMapper(getHomePage())); @@ -792,7 +796,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica StringBuilder sb = new StringBuilder(); String delim = ""; for (Member m : hazelcast.getCluster().getMembers()) { - sb.append(delim).append(m.getInetSocketAddress().getAddress().getHostAddress()); + sb.append(delim).append(m.getAddress().getHost()); delim = ";"; } if (Strings.isEmpty(delim)) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/cb0a60b9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0ff8719..22fb15d 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ <maven-site.version>3.3</maven-site.version> <wicket.version>8.0.0-M6</wicket.version> <wicketju.version>8.0.0-M6</wicketju.version> - <wickets.version>8.0.0-M6</wickets.version> + <wickets.version>8.0.0-SNAPSHOT</wickets.version> <red5-server.version>1.0.10-M3</red5-server.version> <red5-client.version>1.0.10-M3</red5-client.version> <spring.version>4.3.10.RELEASE</spring.version>
