Can't build Gateway against OpenYMSG source

Hi all. It seems as though the Gateway trunk and the OpenYMSG trunk is incompatible. When trying to build the Gateway against the OpenYMSG source rather than the included openymsg.jar file, I get the following errors:

[javac] symbol : method getUsers()
[javac] location: class org.openymsg.network.event.SessionFriendEvent
[javac] for (YahooUser user : event.getUsers()) {
[javac] ^
[javac]

/openfire/openfire_3_6_0/src/plugins/gateway/src/java/org/jivesoftware/openfire/ gateway/protocols/yahoo/YahooSession.java:206: cannot find symbol
[javac] symbol : method getUsers()
[javac] location: class org.openymsg.network.Session
[javac] for (Object userObj : yahooSession.getUsers().values()) {
[javac] ^
[javac]
/openfire/openfire_3_6_0/src/plugins/gateway/src/java/org/jivesoftware/openfire/ gateway/protocols/yahoo/YahooSession.java:260: cannot find symbol
[javac] symbol : method getGroups()
[javac] location: class org.openymsg.network.YahooUser
[javac] for (YahooGroup yahooGroup : yUser.getGroups()) {
[javac] ^
[javac] Note:

/openfire/openfire_3_6_0/src/plugins/gateway/src/java/org/jivesoftware/openfire/ gateway/registration/RegistrationManager.java uses unchecked or unsafe operations.
[javac] Note: Recompile with -Xlint:unchecked for details.
[javac] 3 errors

It seems as though this stems from the following changes in OpenYMSG:

http://www.igniterealtime.org/fisheye/browse/svn-org/openymsg/trunk/src/main/jav a/org/openymsg/network/event/SessionFriendEvent.java?r1=9587&r2=9598

Notice that getUsers is no longer a method of SessionFriendEvent.

http://www.igniterealtime.org/fisheye/browse/svn-org/openymsg/trunk/src/main/jav a/org/openymsg/network/Session.java?r1=9602&r2=9608

getUsers removed from Session

However, reverting back to revision 9598 (which is buildable) causes the Yahoo gateway to fail, because it is missing the following fix:

http://www.igniterealtime.org/fisheye/changelog/svn-org/openymsg?cs=9608

Has anyone else run into this or knows how openymsg.jar that’s included with the Gateway was built?