Commit 374b7c57 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Misc work, unfortunately not accomplishing what I had hoped. Have determined...

Misc work, unfortunately not accomplishing what I had hoped.  Have determined jmml is not the best library to be using.  JML looks good and fairly recent.  Going to try it.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4890 b35dd754-fafc-0310-a699-88a17e54d16e
parent d9e69cd3
Name | Version Name | Version
--------------------------------------------- ---------------------------------------------
joscar.jar | 0.9.3 (patched) cindy.jar | 2.4.3
commons-logging.jar | 1.1
jml.jar | 1.0a2
jmml.jar | cvs-2006-07-19 jmml.jar | cvs-2006-07-19
picocontainer | 1.2.0 joscar.jar | 0.9.3 (patched)
picocontainer.jar | 1.2.0
ymsg_network.jar | 0.61 ymsg_network.jar | 0.61
ymsg_support.jar | 0.6 ymsg_support.jar | 0.6
...@@ -25,7 +25,7 @@ import java.util.TreeMap; ...@@ -25,7 +25,7 @@ import java.util.TreeMap;
* *
* @author Daniel Henninger * @author Daniel Henninger
*/ */
public abstract class TransportSession implements Runnable { public abstract class TransportSession extends Thread {
/** /**
* Creates a TransportSession instance. * Creates a TransportSession instance.
...@@ -147,9 +147,9 @@ public abstract class TransportSession implements Runnable { ...@@ -147,9 +147,9 @@ public abstract class TransportSession implements Runnable {
/** /**
* Handles monitoring of whether session is still valid. * Handles monitoring of whether session is still valid.
*/ */
public void run() { // public void run() {
while (validSession) { Log.debug("This is the loop running. Just want to catch it doing so."); } // while (validSession) { }
} // }
/** /**
* Indicates that the session is done and should be stopped. * Indicates that the session is done and should be stopped.
......
...@@ -40,6 +40,7 @@ public class MSNTransport extends BaseTransport { ...@@ -40,6 +40,7 @@ public class MSNTransport extends BaseTransport {
public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) { public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) {
Log.debug("Logging in to MSN gateway."); Log.debug("Logging in to MSN gateway.");
TransportSession session = new MSNSession(registration, jid, this); TransportSession session = new MSNSession(registration, jid, this);
session.start();
((MSNSession)session).logIn(presenceType, verboseStatus); ((MSNSession)session).logIn(presenceType, verboseStatus);
return session; return session;
} }
...@@ -52,6 +53,7 @@ public class MSNTransport extends BaseTransport { ...@@ -52,6 +53,7 @@ public class MSNTransport extends BaseTransport {
public void registrationLoggedOut(TransportSession session) { public void registrationLoggedOut(TransportSession session) {
Log.debug("Logging out of MSN gateway."); Log.debug("Logging out of MSN gateway.");
((MSNSession)session).logOut(); ((MSNSession)session).logOut();
session.stop();
} }
/** /**
......
...@@ -36,6 +36,7 @@ public class OSCARTransport extends BaseTransport { ...@@ -36,6 +36,7 @@ public class OSCARTransport extends BaseTransport {
*/ */
public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) { public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) {
TransportSession session = new OSCARSession(registration, jid, this); TransportSession session = new OSCARSession(registration, jid, this);
session.start();
((OSCARSession)session).logIn(presenceType, verboseStatus); ((OSCARSession)session).logIn(presenceType, verboseStatus);
return session; return session;
} }
...@@ -47,6 +48,7 @@ public class OSCARTransport extends BaseTransport { ...@@ -47,6 +48,7 @@ public class OSCARTransport extends BaseTransport {
*/ */
public void registrationLoggedOut(TransportSession session) { public void registrationLoggedOut(TransportSession session) {
((OSCARSession)session).logOut(); ((OSCARSession)session).logOut();
session.stop();
} }
} }
...@@ -40,6 +40,7 @@ public class YahooTransport extends BaseTransport { ...@@ -40,6 +40,7 @@ public class YahooTransport extends BaseTransport {
public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) { public TransportSession registrationLoggedIn(Registration registration, JID jid, PresenceType presenceType, String verboseStatus) {
Log.debug("Logging in to Yahoo gateway."); Log.debug("Logging in to Yahoo gateway.");
TransportSession session = new YahooSession(registration, jid, this); TransportSession session = new YahooSession(registration, jid, this);
session.start();
((YahooSession)session).logIn(presenceType, verboseStatus); ((YahooSession)session).logIn(presenceType, verboseStatus);
return session; return session;
} }
...@@ -52,6 +53,7 @@ public class YahooTransport extends BaseTransport { ...@@ -52,6 +53,7 @@ public class YahooTransport extends BaseTransport {
public void registrationLoggedOut(TransportSession session) { public void registrationLoggedOut(TransportSession session) {
Log.debug("Logging out of Yahoo gateway."); Log.debug("Logging out of Yahoo gateway.");
((YahooSession)session).logOut(); ((YahooSession)session).logOut();
session.stop();
} }
/** /**
......
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