prepare for 1.4.0 release

igniterealtime · Apr 30, 2021 · 599840c · 599840c
1 parent 5de662d
commit 599840c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
diff --git 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
@@ -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",
+            "       }",				
+            "    }",			
             "}"
         );