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
3b4d1681
Commit
3b4d1681
authored
Dec 20, 2016
by
Dave Cridland
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-1246 Address Guus's comments
parent
590a5746
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
12 deletions
+27
-12
openfire_db2.sql
src/database/upgrade/25/openfire_db2.sql
+2
-0
openfire_hsqldb.sql
src/database/upgrade/25/openfire_hsqldb.sql
+2
-0
openfire_mysql.sql
src/database/upgrade/25/openfire_mysql.sql
+2
-0
openfire_oracle.sql
src/database/upgrade/25/openfire_oracle.sql
+2
-0
openfire_postgresql.sql
src/database/upgrade/25/openfire_postgresql.sql
+2
-0
openfire_sqlserver.sql
src/database/upgrade/25/openfire_sqlserver.sql
+2
-0
openfire_sybase.sql
src/database/upgrade/25/openfire_sybase.sql
+2
-0
MucMamPersistenceManager.java
...penfire/plugin/archive/impl/MucMamPersistenceManager.java
+13
-12
No files found.
src/database/upgrade/25/openfire_db2.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
25
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
25
WHERE
name
=
'openfire'
;
src/database/upgrade/25/openfire_hsqldb.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/database/upgrade/25/openfire_mysql.sql
View file @
3b4d1681
ALTER
TABLE
ofMucConversationLog
ADD
INDEX
ofMucConvLog_msg_id
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/database/upgrade/25/openfire_oracle.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/database/upgrade/25/openfire_postgresql.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/database/upgrade/25/openfire_sqlserver.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/database/upgrade/25/openfire_sybase.sql
View file @
3b4d1681
CREATE
INDEX
ofMucConvLog_msg_id
ON
ofMucConversationLog
(
messageID
);
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
UPDATE
ofVersion
SET
version
=
24
WHERE
name
=
'openfire'
;
\ No newline at end of file
src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/impl/MucMamPersistenceManager.java
View file @
3b4d1681
...
@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MultiUserChatManager;
...
@@ -18,6 +18,7 @@ import org.jivesoftware.openfire.muc.MultiUserChatManager;
import
org.jivesoftware.openfire.muc.MultiUserChatService
;
import
org.jivesoftware.openfire.muc.MultiUserChatService
;
import
org.jivesoftware.openfire.muc.NotAllowedException
;
import
org.jivesoftware.openfire.muc.NotAllowedException
;
import
org.jivesoftware.util.JiveGlobals
;
import
org.jivesoftware.util.JiveGlobals
;
import
org.jivesoftware.util.Log
;
import
org.jivesoftware.util.StringUtils
;
import
org.jivesoftware.util.StringUtils
;
import
org.jivesoftware.util.XMPPDateTimeFormat
;
import
org.jivesoftware.util.XMPPDateTimeFormat
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
...
@@ -47,37 +48,37 @@ public class MucMamPersistenceManager implements PersistenceManager {
...
@@ -47,37 +48,37 @@ public class MucMamPersistenceManager implements PersistenceManager {
private
static
final
String
ORDER_BY
=
" ORDER BY logTime"
;
private
static
final
String
ORDER_BY
=
" ORDER BY logTime"
;
@Override
@Override
public
boolean
createMessage
(
ArchivedMessage
message
)
{
public
boolean
createMessage
(
ArchivedMessage
message
)
{
return
false
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
int
processAllMessages
(
ArchivedMessageConsumer
callback
)
{
public
int
processAllMessages
(
ArchivedMessageConsumer
callback
)
{
return
0
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
boolean
createConversation
(
Conversation
conversation
)
{
public
boolean
createConversation
(
Conversation
conversation
)
{
return
false
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
boolean
updateConversationEnd
(
Conversation
conversation
)
{
public
boolean
updateConversationEnd
(
Conversation
conversation
)
{
return
false
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
boolean
createParticipant
(
Participant
participant
,
Long
conversationId
)
{
public
boolean
createParticipant
(
Participant
participant
,
Long
conversationId
)
{
return
false
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
List
<
Conversation
>
findConversations
(
String
[]
participants
,
Date
startDate
,
Date
endDate
)
{
public
List
<
Conversation
>
findConversations
(
String
[]
participants
,
Date
startDate
,
Date
endDate
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
Collection
<
Conversation
>
findConversations
(
Date
startDate
,
Date
endDate
,
String
owner
,
String
with
,
XmppResultSet
xmppResultSet
)
{
public
Collection
<
Conversation
>
findConversations
(
Date
startDate
,
Date
endDate
,
String
owner
,
String
with
,
XmppResultSet
xmppResultSet
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
...
@@ -159,7 +160,7 @@ public class MucMamPersistenceManager implements PersistenceManager {
...
@@ -159,7 +160,7 @@ public class MucMamPersistenceManager implements PersistenceManager {
msgs
.
add
(
archivedMessage
);
msgs
.
add
(
archivedMessage
);
}
}
}
catch
(
SQLException
e
)
{
}
catch
(
SQLException
e
)
{
// TODO ???
Log
.
error
(
"SQL failure during MAM-MUC: "
,
e
);
}
finally
{
}
finally
{
DbConnectionManager
.
closeConnection
(
rs
,
pstmt
,
connection
);
DbConnectionManager
.
closeConnection
(
rs
,
pstmt
,
connection
);
}
}
...
@@ -183,21 +184,21 @@ public class MucMamPersistenceManager implements PersistenceManager {
...
@@ -183,21 +184,21 @@ public class MucMamPersistenceManager implements PersistenceManager {
@Override
@Override
public
Collection
<
Conversation
>
getActiveConversations
(
int
conversationTimeout
)
{
public
Collection
<
Conversation
>
getActiveConversations
(
int
conversationTimeout
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
List
<
Conversation
>
getConversations
(
Collection
<
Long
>
conversationIds
)
{
public
List
<
Conversation
>
getConversations
(
Collection
<
Long
>
conversationIds
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
Conversation
getConversation
(
String
ownerJid
,
String
withJid
,
Date
start
)
{
public
Conversation
getConversation
(
String
ownerJid
,
String
withJid
,
Date
start
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
@Override
@Override
public
Conversation
getConversation
(
Long
conversationId
)
{
public
Conversation
getConversation
(
Long
conversationId
)
{
return
null
;
throw
new
UnsupportedOperationException
(
"MAM-MUC cannot perform this operation"
)
;
}
}
}
}
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