Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
fc9b4693
Commit
fc9b4693
authored
May 08, 2017
by
Guus der Kinderen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-1326: Made compatible with HttpBind API changes.
parent
e4a4fdd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
changelog.html
src/plugins/websocket/changelog.html
+7
-0
plugin.xml
src/plugins/websocket/plugin.xml
+3
-3
WebSocketPlugin.java
.../org/jivesoftware/openfire/websocket/WebSocketPlugin.java
+6
-6
No files found.
src/plugins/websocket/changelog.html
View file @
fc9b4693
...
...
@@ -44,6 +44,13 @@
Openfire WebSocket Plugin Changelog
</h1>
<p><b>
1.2.0
</b>
-- May 8, 2017
</p>
<ul>
<li>
[
<a
href=
'https://igniterealtime.org/issues/browse/OF-1326'
></a>
] - Made compatible with new HttpBind API in Openfire 4.2.0
</li>
<li>
Minimum server requirement: 4.2.0 Alpha
</li>
</ul>
<p><b>
1.1.4
</b>
-- March 3, 2016
</p>
<ul>
...
...
src/plugins/websocket/plugin.xml
View file @
fc9b4693
...
...
@@ -8,8 +8,8 @@
<name>
Openfire WebSocket
</name>
<description>
Provides WebSocket support for Openfire.
</description>
<author>
Tom Evans
</author>
<version>
1.
1.4
</version>
<date>
0
3/03/2016
</date>
<version>
1.
2.0
</version>
<date>
0
5/08/2017
</date>
<url>
https://tools.ietf.org/html/rfc7395
</url>
<minServerVersion>
4.
1
.0 Alpha
</minServerVersion>
<minServerVersion>
4.
2
.0 Alpha
</minServerVersion>
</plugin>
\ No newline at end of file
src/plugins/websocket/src/java/org/jivesoftware/openfire/websocket/WebSocketPlugin.java
View file @
fc9b4693
...
...
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
*/
public
class
WebSocketPlugin
extends
WebSocketServlet
implements
Plugin
{
private
static
final
long
serialVersionUID
=
728184149282946460
3
L
;
private
static
final
long
serialVersionUID
=
728184149282946460
4
L
;
private
static
final
Logger
Log
=
LoggerFactory
.
getLogger
(
WebSocketPlugin
.
class
);
private
ServletContextHandler
contextHandler
;
...
...
@@ -63,11 +63,12 @@ public class WebSocketPlugin extends WebSocketServlet implements Plugin {
Log
.
info
(
String
.
format
(
"Initializing websocket plugin"
));
try
{
ContextHandlerCollection
contexts
=
HttpBindManager
.
getInstance
().
getContexts
();
contextHandler
=
new
ServletContextHandler
(
contexts
,
"/ws"
,
ServletContextHandler
.
SESSIONS
);
contextHandler
=
new
ServletContextHandler
(
null
,
"/ws"
,
ServletContextHandler
.
SESSIONS
);
contextHandler
.
addServlet
(
new
ServletHolder
(
this
),
"/*"
);
}
catch
(
Exception
e
)
{
HttpBindManager
.
getInstance
().
addJettyHandler
(
contextHandler
);
}
catch
(
Exception
e
)
{
Log
.
error
(
"Failed to start websocket plugin"
,
e
);
}
}
else
{
...
...
@@ -88,8 +89,7 @@ public class WebSocketPlugin extends WebSocketServlet implements Plugin {
}
}
}
ContextHandlerCollection
contexts
=
HttpBindManager
.
getInstance
().
getContexts
();
contexts
.
removeHandler
(
contextHandler
);
HttpBindManager
.
getInstance
().
removeJettyHandler
(
contextHandler
);
contextHandler
=
null
;
pluginClassLoader
=
null
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment