Skip to content

O
Openfire
Commit a897ab9f authored by daryl herzmann's avatar daryl herzmann
Browse files
Options

Merge pull request #241 from tevans/OF-922 

OF-922: Revert MINA to 2.0.7
parents b1f8364f da5fb70d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 29 deletions
build/lib/merge/ognl.jar
View file @ a897ab9f
No preview for this file type
build/lib/versions.txt
View file @ a897ab9f
...@@ -7,7 +7,7 @@ bcpg-jdk15on.jar | 1.51 ...@@ -7,7 +7,7 @@ bcpg-jdk15on.jar | 1.51
bcpkix-jdk15on.jar | 1.51 | See http://www.bouncycastle.org/licence.html bcpkix-jdk15on.jar | 1.51 | See http://www.bouncycastle.org/licence.html
bcprov-jdk15on.jar | 1.51 | See http://www.bouncycastle.org/licence.html bcprov-jdk15on.jar | 1.51 | See http://www.bouncycastle.org/licence.html
cglib.jar | 2.1.3 (JMock 2.1.0) | cglib.jar | 2.1.3 (JMock 2.1.0) |
commons-lang.jar | 2.6 (Apache Mina 2.0.9) | Apache 2.0 commons-lang.jar | 2.3 | Apache 2.0
commons-logging.jar | Jetty 5.1.10 | Apache 2.0 commons-logging.jar | Jetty 5.1.10 | Apache 2.0
commons-el.jar | Jetty 6.0.1 (1.0) | Apache 2.0 commons-el.jar | Jetty 6.0.1 (1.0) | Apache 2.0
commons-httpclient.jar | 3.1 | Apache 2.0 commons-httpclient.jar | 3.1 | Apache 2.0
...@@ -55,17 +55,17 @@ jsp-api.jar | Jetty 6.0.1 (2.0) ...@@ -55,17 +55,17 @@ jsp-api.jar | Jetty 6.0.1 (2.0)
jtds.jar | 1.3.1 | LGPL jtds.jar | 1.3.1 | LGPL
junit.jar | 4.11 | EPL 1.0 junit.jar | 4.11 | EPL 1.0
hamcrest-core.jar | 1.3 (required by junit) | new BSD licence hamcrest-core.jar | 1.3 (required by junit) | new BSD licence
jzlib.jar | 1.1.3 (Apache Mina 2.0.9) | GPL jzlib.jar | 1.0.7 | GPL
libidn.jar | 1.15 | GNU Lesser General Public License version 2.1 or later (http://www.gnu.org/licenses/licenses.html) libidn.jar | 1.15 | GNU Lesser General Public License version 2.1 or later (http://www.gnu.org/licenses/licenses.html)
log4j.jar | 1.2.15 | Apache 2.0 (http://logging.apache.org/log4j/1.2/license.html) log4j.jar | 1.2.15 | Apache 2.0 (http://logging.apache.org/log4j/1.2/license.html)
mail.jar | 1.4.1 (JavaMail) | mail.jar | 1.4.1 (JavaMail) |
mina-core.jar | Apache Mina 2.0.10-SNAPSHOT (fixes OF-857) | Apache 2.0 mina-core.jar | Apache Mina 2.0.7 | Apache 2.0
mina-filter-compression.jar | Apache Mina 2.0.9 | Apache 2.0 mina-filter-compression.jar | Apache Mina 2.0.7 | Apache 2.0
mina-integration-beans.jar | Apache Mina 2.0.9 | Apache 2.0 mina-integration-beans.jar | Apache Mina 2.0.7 | Apache 2.0
mina-integration-jmx.jar | Apache Mina 2.0.9 | Apache 2.0 mina-integration-jmx.jar | Apache Mina 2.0.7 | Apache 2.0
mina-integration-ognl.jar | Apache Mina 2.0.9 | Apache 2.0 mina-integration-ognl.jar | Apache Mina 2.0.7 | Apache 2.0
javassist.jar | 3.11.0.GA (Apache Mina 2.0.9) | Apache 2.0 javassist.jar | 3.11.0.GA (Apache Mina 2.0.7) | Apache 2.0
ognl.jar | 3.0.8 (Apache Mina 2.0.9) | Apache 2.0 ognl.jar | 3.0.5 (Apache Mina 2.0.7) | Apache 2.0
mysql.jar | 5.1.30 | GPL mysql.jar | 5.1.30 | GPL
objenesis | 1.0 (JMock 2.1.0) | BSD (http://www.jmock.org/license.html) objenesis | 1.0 (JMock 2.1.0) | BSD (http://www.jmock.org/license.html)
pack200task.jar | August 5, 2004 | LGPL pack200task.jar | August 5, 2004 | LGPL
......
src/java/org/apache/mina/management/MINAStatCollector.java
View file @ a897ab9f
...@@ -87,10 +87,6 @@ public class MINAStatCollector { ...@@ -87,10 +87,6 @@ public class MINAStatCollector {
@Override @Override
public void serviceDeactivated(IoService service) throws Exception { public void serviceDeactivated(IoService service) throws Exception {
} }
@Override
public void sessionClosed(IoSession arg0) throws Exception {
}
}; };
/** /**
......
src/java/org/jivesoftware/openfire/nio/ConnectionHandler.java
View file @ a897ab9f
...@@ -19,14 +19,9 @@ ...@@ -19,14 +19,9 @@
package org.jivesoftware.openfire.nio; package org.jivesoftware.openfire.nio;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.dom4j.io.XMPPPacketReader; import org.dom4j.io.XMPPPacketReader;
import org.jivesoftware.openfire.Connection; import org.jivesoftware.openfire.Connection;
import org.jivesoftware.openfire.net.MXParser; import org.jivesoftware.openfire.net.MXParser;
...@@ -38,8 +33,6 @@ import org.xmlpull.v1.XmlPullParserException; ...@@ -38,8 +33,6 @@ import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParserFactory;
import org.xmpp.packet.StreamError; import org.xmpp.packet.StreamError;
import javax.net.ssl.SSLHandshakeException;
/** /**
* A ConnectionHandler is responsible for creating new sessions, destroying sessions and delivering * A ConnectionHandler is responsible for creating new sessions, destroying sessions and delivering
* received XML stanzas to the proper StanzaHandler. * received XML stanzas to the proper StanzaHandler.
...@@ -107,14 +100,6 @@ public abstract class ConnectionHandler extends IoHandlerAdapter { ...@@ -107,14 +100,6 @@ public abstract class ConnectionHandler extends IoHandlerAdapter {
} }
} }
@Override
public void inputClosed( IoSession session ) throws Exception {
final Connection connection = (Connection) session.getAttribute(CONNECTION);
if ( connection != null ) {
connection.close( true );
}
}
@Override @Override
public void sessionClosed(IoSession session) throws Exception { public void sessionClosed(IoSession session) throws Exception {
final Connection connection = (Connection) session.getAttribute(CONNECTION); final Connection connection = (Connection) session.getAttribute(CONNECTION);
......
src/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
View file @ a897ab9f
...@@ -926,7 +926,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana ...@@ -926,7 +926,6 @@ public class ConnectionManagerImpl extends BasicModule implements ConnectionMana
public void serviceActivated(IoService service) throws Exception { } public void serviceActivated(IoService service) throws Exception { }
public void serviceDeactivated(IoService service) throws Exception { } public void serviceDeactivated(IoService service) throws Exception { }
public void serviceIdle(IoService service, IdleStatus idleStatus) throws Exception { } public void serviceIdle(IoService service, IdleStatus idleStatus) throws Exception { }
public void sessionClosed(IoSession ioSession) throws Exception { }
}); });
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023