dude, I went to bed at 2 am with invoker madness in my head, but you are even worse :)
marcf |-----Original Message----- |From: [EMAIL PROTECTED] |[mailto:[EMAIL PROTECTED]]On Behalf Of Scott |M Stark |Sent: Tuesday, November 20, 2001 4:54 AM |To: [EMAIL PROTECTED] |Subject: [JBoss-dev] CVS update: |contrib/catalina/src/main/org/jboss/web/catalina |EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java |Log4jLogger.java | | | User: starksm | Date: 01/11/20 01:54:19 | | Modified: catalina/src/main/org/jboss/web/catalina Tag: Branch_2_4 | EmbeddedCatalinaServiceSX.java | EmbeddedCatalinaServiceSXMBean.java | Log4jLogger.java | Log: | Change to the unified log4j based org.jboss.logging.Logger class. | | Revision Changes Path | No revision | | | No revision | | | 1.2.2.3 +17 -17 |contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaSe |rviceSX.java | | Index: EmbeddedCatalinaServiceSX.java | =================================================================== | RCS file: |/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/Emb |eddedCatalinaServiceSX.java,v | retrieving revision 1.2.2.2 | retrieving revision 1.2.2.3 | diff -u -r1.2.2.2 -r1.2.2.3 | --- EmbeddedCatalinaServiceSX.java 2001/11/12 19:21:18 1.2.2.2 | +++ EmbeddedCatalinaServiceSX.java 2001/11/20 09:54:18 1.2.2.3 | @@ -28,7 +28,7 @@ | import org.xml.sax.EntityResolver; | import org.xml.sax.InputSource; | | -import org.jboss.ejb.DeploymentException; | +import org.jboss.deployment.DeploymentException; | import org.jboss.security.SecurityDomain; | import org.jboss.web.AbstractWebContainer; | import org.jboss.web.AbstractWebContainer.WebDescriptorParser; | @@ -65,7 +65,7 @@ | @see org.apache.catalina.startup.Embedded | | @author [EMAIL PROTECTED] | - @version $Revision: 1.2.2.2 $ | + @version $Revision: 1.2.2.3 $ | */ | public class EmbeddedCatalinaServiceSX extends |AbstractWebContainer implements EmbeddedCatalinaServiceSXMBean | { | @@ -204,25 +204,25 @@ | | public void startService() throws Exception | { | - category.info("Starting " + NAME + "...."); | + log.info("Starting " + NAME + "...."); | | // Start create the embeded catalina container but don't |let it overwrite the thread class loader | URLClassLoader cl = (URLClassLoader) |Thread.currentThread().getContextClassLoader(); | URLClassLoader parent = cl; | while( parent != null ) | { | - category.trace(parent); | + log.trace(parent); | URL[] urls = parent.getURLs(); | for(int u = 0; u < urls.length; u ++) | - category.trace(" "+urls[u]); | + log.trace(" "+urls[u]); | parent = (URLClassLoader) parent.getParent(); | } | | // Determine the catalina debug level from the enabled priority | debugLevel = 0; | - if( category.isTraceEnabled() ) | + if( log.isTraceEnabled() ) | debugLevel = 2; | - category.debug("Setting catalina debug level to: "+debugLevel); | + log.debug("Setting catalina debug level to: "+debugLevel); | | try | { | @@ -232,7 +232,7 @@ | String homePath = catalinaHome.getFile(); | File homeDir = new File(homePath, "../../.."); | homePath = homeDir.getCanonicalPath(); | - category.debug("Setting catalina.home to: " + homePath); | + log.debug("Setting catalina.home to: " + homePath); | System.setProperty("catalina.home", homePath); | System.setProperty("catalina.base", homePath); | initCatalina(cl); | @@ -242,7 +242,7 @@ | { | Thread.currentThread().setContextClassLoader(cl); | } | - category.info("OK"); | + log.info("OK"); | } | | public void stopService() | @@ -266,15 +266,15 @@ | { | if( ctxPath.equals("/") ) | { | - category.info("Changing root context path from '/' to ''"); | + log.info("Changing root context path from '/' to ''"); | ctxPath = ""; | } | - category.info("deploy, ctxPath="+ctxPath+", warUrl="+warUrl); | + log.info("deploy, ctxPath="+ctxPath+", warUrl="+warUrl); | ClassLoader ctxClassLoader = |Thread.currentThread().getContextClassLoader(); | | URL url = new URL(warUrl); | WebApplication appInfo = createWebContext(ctxPath, url, |webAppParser); | - category.debug("Initialized: "+appInfo); | + log.debug("Initialized: "+appInfo); | return appInfo; | } | | @@ -302,7 +302,7 @@ | */ | private void initCatalina(ClassLoader parent) throws Exception | { | - Logger jbossLog = new Log4jLogger(this.category); | + Logger jbossLog = new Log4jLogger(this.log); | Realm jbossRealm = new JBossSecurityMgrRealm(); | catalina = new Embedded(jbossLog, jbossRealm); | catalina.setDebug(debugLevel); | @@ -375,7 +375,7 @@ | Object source = event.getSource(); | if( source == context && |event.getType().equals(Lifecycle.START_EVENT) ) | { | - category.debug("Context.lifecycleEvent, |event="+event); | + log.debug("Context.lifecycleEvent, event="+event); | contextInit(context, appInfo, webAppParser); | } | } | @@ -402,7 +402,7 @@ | stream = servletCtx.getResourceAsStream("/WEB-INF/web.xml"); | if( stream == null ) | { | - category.warn("No /WEB-INF/web.xml descriptor found"); | + log.warn("No /WEB-INF/web.xml descriptor found"); | return; | } | | @@ -448,7 +448,7 @@ | } | catch(Exception e) | { | - category.error("Failed to setup web application ENC", e); | + log.error("Failed to setup web application ENC", e); | } | } | | @@ -477,7 +477,7 @@ | ClassLoader loader = |Thread.currentThread().getContextClassLoader(); | InputStream dtdStream = |loader.getResourceAsStream(dtd); | if( dtdStream == null ) | - category.warn("Failed to find local dtd: "+dtd); | + log.warn("Failed to find local dtd: "+dtd); | else | is = new InputSource(dtdStream); | } | | | | 1.1.2.2 +1 -2 |contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaSe |rviceSXMBean.java | | Index: EmbeddedCatalinaServiceSXMBean.java | =================================================================== | RCS file: |/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/Emb |eddedCatalinaServiceSXMBean.java,v | retrieving revision 1.1.2.1 | retrieving revision 1.1.2.2 | diff -u -r1.1.2.1 -r1.1.2.2 | --- EmbeddedCatalinaServiceSXMBean.java 2001/11/12 19:21:18 |1.1.2.1 | +++ EmbeddedCatalinaServiceSXMBean.java 2001/11/20 09:54:19 |1.1.2.2 | @@ -11,13 +11,12 @@ | | import org.w3c.dom.Element; | | -import org.jboss.ejb.DeploymentException; | import org.jboss.web.AbstractWebContainerMBean; | | /** Management interface for the embedded Catalina service. | * | * @author [EMAIL PROTECTED] | - * @version $Revision: 1.1.2.1 $ | + * @version $Revision: 1.1.2.2 $ | */ | public interface EmbeddedCatalinaServiceSXMBean extends |AbstractWebContainerMBean | { | | | | 1.1.2.1 +22 -20 |contrib/catalina/src/main/org/jboss/web/catalina/Log4jLogger.java | | Index: Log4jLogger.java | =================================================================== | RCS file: |/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/Log |4jLogger.java,v | retrieving revision 1.1 | retrieving revision 1.1.2.1 | diff -u -r1.1 -r1.1.2.1 | --- Log4jLogger.java 2001/09/26 03:11:30 1.1 | +++ Log4jLogger.java 2001/11/20 09:54:19 1.1.2.1 | @@ -12,13 +12,15 @@ | | import org.apache.catalina.Container; | import org.apache.catalina.LifecycleException; | -import org.apache.catalina.Logger; | import org.apache.log4j.Category; | | -/** | +import org.jboss.logging.Logger; | + | +/** An adaptor from the org.apache.catalina.Logger to the log4j |based loggin | + used by JBoss. | * | * @author [EMAIL PROTECTED] | - * @version | + * @version $Revision: 1.1.2.1 $ | */ | public class Log4jLogger implements org.apache.catalina.Logger | { | @@ -27,14 +29,14 @@ | /** The property change support for this component. */ | protected PropertyChangeSupport support = new |PropertyChangeSupport(this); | /** The log4j Category */ | - Category category; | + Logger log; | /** The verbosity level for above which log messages may be |filtered. */ | protected int verbosity = ERROR; | | /** Creates new Log4jLogger */ | - public Log4jLogger(Category category) | + public Log4jLogger(Logger log) | { | - this.category = category; | + this.log = log; | } | | /** | @@ -129,7 +131,7 @@ | */ | public void log(String message) | { | - category.info(message); | + log.info(message); | } | | /** | @@ -145,7 +147,7 @@ | */ | public void log(Exception exception, String message) | { | - category.error(message, exception); | + log.error(message, exception); | } | | /** | @@ -162,19 +164,19 @@ | switch( verbosity ) | { | case FATAL: | - category.fatal(message); | + log.fatal(message); | break; | case ERROR: | - category.error(message); | + log.error(message); | break; | case WARNING: | - category.warn(message); | + log.warn(message); | break; | case INFORMATION: | - category.info(message); | + log.info(message); | break; | case DEBUG: | - category.debug(message); | + log.debug(message); | break; | } | } | @@ -196,10 +198,10 @@ | rootCause = ((LifecycleException) throwable).getThrowable(); | else if (throwable instanceof ServletException) | rootCause = ((ServletException) throwable).getRootCause(); | - category.error(message, throwable); | + log.error(message, throwable); | if( rootCause != null ) | { | - category.error("----- Root Cause -----", rootCause); | + log.error("----- Root Cause -----", rootCause); | } | } | | @@ -218,19 +220,19 @@ | switch( verbosity ) | { | case FATAL: | - category.fatal(message, throwable); | + log.fatal(message, throwable); | break; | case ERROR: | - category.error(message, throwable); | + log.error(message, throwable); | break; | case WARNING: | - category.warn(message, throwable); | + log.warn(message, throwable); | break; | case INFORMATION: | - category.info(message, throwable); | + log.info(message, throwable); | break; | case DEBUG: | - category.debug(message, throwable); | + log.debug(message, throwable); | break; | } | } | | | | |_______________________________________________ |Jboss-development mailing list |[EMAIL PROTECTED] |https://lists.sourceforge.net/lists/listinfo/jboss-development _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development
