Revision: 433 http://skycastle.svn.sourceforge.net/skycastle/?rev=433&view=rev Author: zzorn Date: 2008-04-03 11:15:38 -0700 (Thu, 03 Apr 2008) Log Message: ----------- Wondering how to store the protocol registry singleton. Modified Paths: -------------- trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleClientSessionHandler.java trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleServer.java Modified: trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleClientSessionHandler.java =================================================================== --- trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleClientSessionHandler.java 2008-04-03 14:58:54 UTC (rev 432) +++ trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleClientSessionHandler.java 2008-04-03 18:15:38 UTC (rev 433) @@ -35,7 +35,7 @@ * The {@link Logger} for this class. */ private static final Logger LOGGER = - Logger.getLogger( org.skycastle.server.hardcoded.SkycastleClientSessionListener.class.getName() ); + Logger.getLogger( SkycastleClientSessionHandler.class.getName() ); /** @@ -59,14 +59,10 @@ public SkycastleClientSessionHandler( ClientSession session, SkycastleServer initServerListener ) { - this.mySession = session; + mySession = session; + final DataManager dataManager = AppContext.getDataManager(); serverListener = dataManager.createReference( initServerListener ); - - // Add client to general chat directly - final ChannelManager channelManager = AppContext.getChannelManager(); - final Channel generalChat = channelManager.getChannel( SkycastleServerListener.GENERAL_CHAT ); - generalChat.join( session, null ); } //---------------------------------------------------------------------- Modified: trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleServer.java =================================================================== --- trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleServer.java 2008-04-03 14:58:54 UTC (rev 432) +++ trunk/skycastle/modules/server/src/main/java/org/skycastle/server/SkycastleServer.java 2008-04-03 18:15:38 UTC (rev 433) @@ -3,12 +3,17 @@ import com.sun.sgs.app.AppListener; import com.sun.sgs.app.ClientSession; import com.sun.sgs.app.ClientSessionListener; +import com.sun.sgs.app.AppContext; import java.io.Serializable; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import org.skycastle.protocol.negotiation.ServerSideProtocolNegotiator; +import org.skycastle.protocol.registry.ProtocolRegistry; +import org.skycastle.protocol.registry.ProtocolRegistryImpl; + /** * The Skycastle Server, running inside Darkstar. Recieves events when the server is started the first time, * and when a client logs in. @@ -18,16 +23,34 @@ public class SkycastleServer implements Serializable, AppListener { - public void initialize( final Properties properties ) - { - } + //====================================================================== + // Private Constants + /** * The {@link Logger} for this class. */ private static final Logger LOGGER = Logger.getLogger( SkycastleServer.class.getName() ); + + + //====================================================================== + // Public Methods + + //---------------------------------------------------------------------- + // AppListener Implementation + + public void initialize( final Properties properties ) + { + // Create protocol registry + ProtocolRegistry protocolRegistry = new ProtocolRegistryImpl(); + AppContext.getDataManager().createReference( protocolRegistry ); + + + } + + public ClientSessionListener loggedIn( final ClientSession clientSession ) { // DEBUG: @@ -36,4 +59,5 @@ return new SkycastleClientSessionHandler( clientSession, this ); } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.