From 599840cb969570339123d580acb77ac9803f0ac8 Mon Sep 17 00:00:00 2001 From: Dele Olajide Date: Fri, 30 Apr 2021 14:39:00 +0100 Subject: [PATCH] prepare for 1.4.0 release --- build.cmd | 2 +- .../openfire/plugin/ofmeet/FocusComponent.java | 2 +- .../openfire/plugin/ofmeet/JitsiJicofoWrapper.java | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.cmd b/build.cmd index 6e5f9079..94a4d639 100644 --- a/build.cmd +++ b/build.cmd @@ -2,6 +2,6 @@ call mvn clean package -Dmaven.test.skip=true cd target rename pade-openfire-plugin-assembly.jar pade.jar -copy pade.jar C:\openfire_4_6_2\plugins\pade.jar +copy pade.jar C:\openfire_4_6_3\plugins\pade.jar pause \ No newline at end of file diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/FocusComponent.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/FocusComponent.java index 747d6f18..2b51884b 100644 --- a/src/java/org/jivesoftware/openfire/plugin/ofmeet/FocusComponent.java +++ b/src/java/org/jivesoftware/openfire/plugin/ofmeet/FocusComponent.java @@ -68,7 +68,7 @@ public FocusComponent() to = sess.getAddress().toString(); } iq.setTo(to); - iq.setFrom(from.getNode() + "@focus." + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + "/" + from); + iq.setFrom("focus." + XMPPServer.getInstance().getServerInfo().getXMPPDomain() + "/" + from); XMPPServer.getInstance().getIQRouter().route( iq ); } catch(Exception e) { diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java index 8565eced..2757e404 100644 --- a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java +++ b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java @@ -98,7 +98,7 @@ public synchronized void initialize( File pluginDirectory) throws Exception props.setProperty("org.jitsi.jicofo.jigasi.BREWERY", "ofgasi@" + MAIN_MUC); } - props.setProperty("org.jitsi.jicofo.BRIDGE_MUC", "ofmeet@" + MAIN_MUC); + props.setProperty( "org.jitsi.jicofo.BRIDGE_MUC", "ofmeet@" + MAIN_MUC); props.setProperty( "org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED", "true" ); props.setProperty( "org.jitsi.jicofo.PING_INTERVAL", "-1" ); props.setProperty( "org.jitsi.jicofo.SERVICE_REDISCOVERY_INTERVAL", "60000" ); @@ -122,7 +122,12 @@ public synchronized void initialize( File pluginDirectory) throws Exception " # Whether SCTP data channels are enabled", " enabled = " + (JiveGlobals.getBooleanProperty( "ofmeet.bridge.ws.channel", OSUtils.IS_WINDOWS) ? "false" : "true"), " }", - "", + " xmpp {", + " client {", + " client-proxy = focus." + XMPPServer.getInstance().getServerInfo().getXMPPDomain(), + " use-tls = false", + " }", + " }", "}" );