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
607f80f7
Commit
607f80f7
authored
Nov 09, 2015
by
Christian Schudt
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #365 from sco0ter/jdk8
Fix JDK 8 ambiguity with wildcard imports.
parents
23cce30f
27427dba
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
system-clustering-node.jsp
src/plugins/hazelcast/src/web/system-clustering-node.jsp
+5
-1
BaseTransport.java
src/plugins/kraken/src/java/net/sf/kraken/BaseTransport.java
+5
-1
No files found.
src/plugins/hazelcast/src/web/system-clustering-node.jsp
View file @
607f80f7
...
...
@@ -9,7 +9,11 @@
org.jivesoftware.openfire.cluster.NodeID,
org.jivesoftware.openfire.cluster.ClusterNodeInfo"
%>
<%@ page
import=
"org.jivesoftware.util.*"
%>
<%@ page
import=
"org.jivesoftware.util.Base64"
%>
<%@ page
import=
"org.jivesoftware.util.JiveGlobals"
%>
<%@ page
import=
"org.jivesoftware.util.Log"
%>
<%@ page
import=
"org.jivesoftware.util.LocaleUtils"
%>
<%@ page
import=
"org.jivesoftware.util.ParamUtils"
%>
<%@ page
import=
"org.jivesoftware.util.cache.Cache"
%>
<%@ page
import=
"java.text.DecimalFormat"
%>
<%@ page
import=
"java.text.NumberFormat"
%>
...
...
src/plugins/kraken/src/java/net/sf/kraken/BaseTransport.java
View file @
607f80f7
...
...
@@ -49,7 +49,11 @@ import org.jivesoftware.openfire.user.UserAlreadyExistsException;
import
org.jivesoftware.openfire.user.UserNotFoundException
;
import
org.jivesoftware.openfire.vcard.VCardListener
;
import
org.jivesoftware.openfire.vcard.VCardEventDispatcher
;
import
org.jivesoftware.util.*
;
import
org.jivesoftware.util.Base64
;
import
org.jivesoftware.util.JiveGlobals
;
import
org.jivesoftware.util.LocaleUtils
;
import
org.jivesoftware.util.NotFoundException
;
import
org.jivesoftware.util.StringUtils
;
import
org.jivesoftware.util.cache.CacheFactory
;
import
org.xmpp.component.Component
;
import
org.xmpp.component.ComponentManager
;
...
...
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