User: jules_gosnell Date: 02/01/14 14:25:18 Modified: jetty/src/main/org/jboss/jetty JBossWebApplicationContext.java Jetty.java Log: another step closer to working DistributedHttpSession. It now passes Watchdog with only 2 errors - the same as standalone Jetty. Update jars from Jetty cvs - I need a fix for the Session stuff to work Revision Changes Path 1.16 +11 -6 contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java Index: JBossWebApplicationContext.java =================================================================== RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- JBossWebApplicationContext.java 2002/01/13 21:30:13 1.15 +++ JBossWebApplicationContext.java 2002/01/14 22:25:18 1.16 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: JBossWebApplicationContext.java,v 1.15 2002/01/13 21:30:13 jules_gosnell Exp $ +// $Id: JBossWebApplicationContext.java,v 1.16 2002/01/14 22:25:18 jules_gosnell Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... @@ -42,21 +42,26 @@ WebDescriptorParser _descriptorParser; WebApplication _webApp; DocumentBuilder _parser; - boolean _distributed=false; public JBossWebApplicationContext(HttpServer httpServer, String contextPathSpec, WebDescriptorParser descriptorParser, WebApplication webApp, - DocumentBuilder parser) + DocumentBuilder parser, + String warUrl, + String webDefaults, + boolean unpackWars) + throws java.io.IOException { - super(httpServer, contextPathSpec); + super(httpServer, contextPathSpec, warUrl, webDefaults, unpackWars); _log = Logger.getLogger(getClass().getName()+"#" + contextPathSpec); _descriptorParser = descriptorParser; _webApp = webApp; _parser = parser; + + getServletHandler().setSessionManager(new DistributedHttpSessionManager(this)); } /* ------------------------------------------------------------ */ @@ -123,8 +128,8 @@ } else if ("distributable".equals(element)) { - _distributed=true; - getServletHandler().setSessionManager(new DistributedHttpSessionManager(this)); + ((DistributedHttpSessionManager)getServletHandler().getSessionManager()). + setDistributed(true); } // these are handled by Jetty else 1.33 +7 -5 contrib/jetty/src/main/org/jboss/jetty/Jetty.java Index: Jetty.java =================================================================== RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Jetty.java 2002/01/13 21:30:13 1.32 +++ Jetty.java 2002/01/14 22:25:18 1.33 @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -// $Id: Jetty.java,v 1.32 2002/01/13 21:30:13 jules_gosnell Exp $ +// $Id: Jetty.java,v 1.33 2002/01/14 22:25:18 jules_gosnell Exp $ // A Jetty HttpServer with the interface expected by JBoss' // J2EEDeployer... @@ -35,7 +35,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Julian Gosnell</a> * @author <a href="mailto:[EMAIL PROTECTED]">Andreas Schaefer</a>. - * @version $Revision: 1.32 $ + * @version $Revision: 1.33 $ * * <p><b>Revisions:</b> * @@ -197,15 +197,17 @@ if (getContext(null, contextPath, 0)!=null) _log.warn("A WebApplication is already deployed in context '"+contextPath+"' - proceed at your own risk."); + String fixedWarUrl=warUrl+(warUrl.endsWith("/")?"":"/"); + // deploy the WebApp WebApplicationContext app= - new JBossWebApplicationContext(this, contextPath, descriptorParser, wa, _parser); + new JBossWebApplicationContext(this, contextPath, descriptorParser, wa, _parser, + fixedWarUrl, getWebDefault(), getUnpackWars()); String virtualHost=null; addContext(virtualHost, app); - String fixedWarUrl=warUrl+(warUrl.endsWith("/")?"":"/"); - app.initialize(fixedWarUrl, getWebDefault(), getUnpackWars()); + // app.initialize(fixedWarUrl, getWebDefault(), getUnpackWars()); try {
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development