User: starksm Date: 01/05/24 08:36:40 Modified: tomcat/src/main/org/jboss/tomcat Tag: Branch_2_2 ContextClassLoaderInterceptor.java TomcatEntry.java Added: tomcat/src/main/org/jboss/tomcat Tag: Branch_2_2 EmbeddedTomcatServiceSX.java EmbeddedTomcatServiceSXMBean.java Log: Merge 2.3 changes into 2.2 branch Revision Changes Path No revision No revision 1.5.2.1 +8 -3 contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java Index: ContextClassLoaderInterceptor.java =================================================================== RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -r1.5 -r1.5.2.1 --- ContextClassLoaderInterceptor.java 2000/12/21 16:29:48 1.5 +++ ContextClassLoaderInterceptor.java 2001/05/24 15:36:40 1.5.2.1 @@ -17,7 +17,9 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Rickard Öberg</a> * @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a> - * @version $Revision: 1.5 $ + * @author [EMAIL PROTECTED] + * @version $Revision: 1.5.2.1 $ + * @deprecated No longer needed with the EmbededTomcatServiceSX */ public class ContextClassLoaderInterceptor extends BaseInterceptor @@ -25,8 +27,11 @@ public void contextInit( Context context) throws TomcatException { - ((AdaptiveClassLoader)context.getServletLoader().getParentLoader()).setParent(Thread.currentThread().getContextClassLoader()); - Thread.currentThread().setContextClassLoader(((ClassLoader)context.getServletLoader().getClassLoader())); + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + AdaptiveClassLoader acl = (AdaptiveClassLoader) context.getServletLoader().getParentLoader(); + acl.setParent(tcl); + ClassLoader scl = (ClassLoader) context.getServletLoader().getClassLoader(); + Thread.currentThread().setContextClassLoader(scl); } } 1.2.2.1 +16 -5 contrib/tomcat/src/main/org/jboss/tomcat/TomcatEntry.java Index: TomcatEntry.java =================================================================== RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/TomcatEntry.java,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- TomcatEntry.java 2001/02/20 15:29:00 1.2 +++ TomcatEntry.java 2001/05/24 15:36:40 1.2.2.1 @@ -65,11 +65,15 @@ private Hashtable extraClassPaths = new Hashtable(); - public TomcatEntry() { + public TomcatEntry() + { + this(new String[0]); + } + public TomcatEntry(String[] args) + { try { - String[] args = new String[0]; - execute( args ); + execute( args ); } catch (Exception e) { @@ -79,6 +83,14 @@ public ServletContext addContext( String ctxPath, URL docRoot ) { + Context ctx = addRawContext(ctxPath, docRoot); + ServletContext servletCtx = null; + if( ctx != null ) + servletCtx = ctx.getFacade(); + return servletCtx; + } + public Context addRawContext( String ctxPath, URL docRoot ) + { // tomcat supports only file-based contexts if( ! "file".equals( docRoot.getProtocol()) ) { // log( "addContext() invalid docRoot: " + docRoot ); @@ -95,7 +107,7 @@ m_contextMgr.addContext( ctx ); if (m_facadeMgr == null) m_facadeMgr = ctx.getFacadeManager(); - return ctx.getFacade(); + return ctx; } catch( Exception ex ) { ex.printStackTrace(); } @@ -323,7 +335,6 @@ System.out.println(sm.getString("tomcat.start")); m_contextMgr.init(); // set up contexts - m_contextMgr.start(); // start serving } No revision No revision 1.1.2.1 +5 -14 contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSX.java Index: EmbeddedTomcatServiceSX.java =================================================================== RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSX.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- EmbeddedTomcatServiceSX.java 2001/05/23 18:26:33 1.1 +++ EmbeddedTomcatServiceSX.java 2001/05/24 15:36:40 1.1.2.1 @@ -29,13 +29,10 @@ import org.w3c.dom.Element; import org.jboss.ejb.DeploymentException; -import org.jboss.logging.log4j.CategoryStream; import org.jboss.web.AbstractWebContainer; import org.jboss.web.AbstractWebContainer.WebDescriptorParser; import org.jboss.web.WebApplication; -import org.apache.log4j.Category; -import org.apache.log4j.Priority; import org.apache.tomcat.core.Context; import org.apache.tomcat.core.ContextManager; import org.apache.tomcat.logging.Logger; @@ -47,7 +44,7 @@ @see org.jboss.web.AbstractWebContainer @author [EMAIL PROTECTED] -@version $Revision: 1.1 $ +@version $Revision: 1.1.2.1 $ */ public class EmbeddedTomcatServiceSX extends AbstractWebContainer implements EmbeddedTomcatServiceSXMBean @@ -55,7 +52,6 @@ // Constants ----------------------------------------------------- public static final String NAME = "EmbeddedTomcatSX"; - private Category category; private TomcatEntry tomcat = null; private String configFile = null; @@ -74,12 +70,7 @@ public void startService() throws Exception { - String baseName = AbstractWebContainer.category.getName(); - category = Category.getInstance(baseName+"."+NAME); - category.info("Starting " + NAME + "...."); - // Redirect the default logging to log4j - PrintWriter writer = new PrintWriter(new CategoryStream(category, Priority.DEBUG, System.out)); - Logger.setDefaultSink(writer); + System.out.println("Starting " + NAME + "...."); String[] args = {}; if( configFile != null ) @@ -87,7 +78,7 @@ args = new String[]{"", configFile}; } tomcat = new TomcatEntry(args); - category.info("OK"); + System.out.println("OK"); } public void stopService() @@ -109,7 +100,7 @@ protected WebApplication performDeploy(String ctxPath, String warUrl, WebDescriptorParser webAppParser) throws Exception { - category.info("deploy, ctxPath="+ctxPath+", warUrl="+warUrl); + System.out.println("deploy, ctxPath="+ctxPath+", warUrl="+warUrl); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); // Create the container context in tomcat Context ctx = tomcat.addRawContext(ctxPath, new URL(warUrl)); @@ -150,7 +141,7 @@ appInfo.setWebApp(web); appInfo.setJbossWeb(jbossWeb); appInfo.setAppData(servletCtx); - category.debug("Initialized: "+appInfo); + System.out.println("Initialized: "+appInfo); return appInfo; } 1.1.2.1 +1 -1 contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSXMBean.java Index: EmbeddedTomcatServiceSXMBean.java =================================================================== RCS file: /cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceSXMBean.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- EmbeddedTomcatServiceSXMBean.java 2001/05/23 18:26:33 1.1 +++ EmbeddedTomcatServiceSXMBean.java 2001/05/24 15:36:40 1.1.2.1 @@ -15,7 +15,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a> * @author [EMAIL PROTECTED] - * @version $Revision: 1.1 $ + * @version $Revision: 1.1.2.1 $ */ public interface EmbeddedTomcatServiceSXMBean extends AbstractWebContainerMBean { _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development