User: starksm
Date: 01/11/20 01:49:01
Modified: tomcat/src/main/org/jboss/tomcat Tag: Branch_2_4
EmbeddedTomcatService.java
EmbeddedTomcatServiceMBean.java
EmbeddedTomcatServiceSX.java
EmbeddedTomcatServiceSXMBean.java
Log:
Change to the unified log4j based org.jboss.logging.Logger class.
Revision Changes Path
No revision
No revision
1.11.4.1 +9 -16
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java
Index: EmbeddedTomcatService.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -r1.11 -r1.11.4.1
--- EmbeddedTomcatService.java 2001/02/20 15:29:20 1.11
+++ EmbeddedTomcatService.java 2001/11/20 09:49:00 1.11.4.1
@@ -24,9 +24,8 @@
import javax.servlet.ServletContext;
import org.jboss.logging.Logger;
-import org.jboss.logging.Log;
import org.jboss.util.ServiceMBeanSupport;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
* <description>
@@ -34,12 +33,12 @@
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
* @author Dewayne McNair ([EMAIL PROTECTED])
- * @version $Revision: 1.11 $
+ * @deprecated, use the org.jboss.tomcat.EmbeddedTomcatServiceSX class
+ * @version $Revision: 1.11.4.1 $
*/
-
public class EmbeddedTomcatService
-extends ServiceMBeanSupport
-implements EmbeddedTomcatServiceMBean, MBeanRegistration
+ extends ServiceMBeanSupport
+ implements EmbeddedTomcatServiceMBean, MBeanRegistration
{
// Constants -----------------------------------------------------
public static final String NAME = "EmbeddedTomcat";
@@ -61,13 +60,11 @@
}
public void startService()
- throws Exception
+ throws Exception
{
- final Log log = this.log;
-
- log.log ("Starting " + NAME + "....");
+ log.info("Starting " + NAME + "....");
tomcat = new TomcatEntry();
- log.log ("OK");
+ log.info ("OK");
}
public void stopService()
@@ -89,10 +86,8 @@
// but the JMX RI's html adaptor can't
// show inputs for URLs in HTML forms.
public void deploy(String ctxPath, String warUrl)
- throws DeploymentException
+ throws DeploymentException
{
- final Log log = this.log;
-
ClassLoader oldCcl = Thread.currentThread().getContextClassLoader();
try
{
@@ -121,8 +116,6 @@
public void undeploy(String warUrl) throws DeploymentException
{
- final Log log = this.log;
-
try
{
// find the javax.servlet.ServletContext in the repository
1.5.4.1 +18 -18
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceMBean.java
Index: EmbeddedTomcatServiceMBean.java
===================================================================
RCS file:
/cvsroot/jboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceMBean.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- EmbeddedTomcatServiceMBean.java 2001/02/10 06:00:17 1.5
+++ EmbeddedTomcatServiceMBean.java 2001/11/20 09:49:00 1.5.4.1
@@ -4,31 +4,31 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
+
package org.jboss.tomcat;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
/**
* Management interface for the Embedded Tomcat service
- *
+ *
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.5.4.1 $
*/
-public interface EmbeddedTomcatServiceMBean
- extends org.jboss.util.ServiceMBean
+public interface EmbeddedTomcatServiceMBean
+ extends org.jboss.util.ServiceMBean
{
-
- // Constants -----------------------------------------------------
- public static final String OBJECT_NAME = ":service=EmbeddedTomcat";
-
- public void deploy(String ctxPath, String warUrl)
- throws DeploymentException;
-
- public void undeploy(String warUrl)
- throws DeploymentException;
-
- public boolean isDeployed(String warUrl);
-
+
+ // Constants -----------------------------------------------------
+ public static final String OBJECT_NAME = ":service=EmbeddedTomcat";
+
+ public void deploy(String ctxPath, String warUrl)
+ throws DeploymentException;
+
+ public void undeploy(String warUrl)
+ throws DeploymentException;
+
+ public boolean isDeployed(String warUrl);
+
}
1.2.2.4 +7 -7
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.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- EmbeddedTomcatServiceSX.java 2001/09/28 18:47:30 1.2.2.3
+++ EmbeddedTomcatServiceSX.java 2001/11/20 09:49:00 1.2.2.4
@@ -25,7 +25,7 @@
import org.w3c.dom.Element;
-import org.jboss.ejb.DeploymentException;
+import org.jboss.deployment.DeploymentException;
import org.jboss.logging.log4j.CategoryStream;
import org.jboss.web.AbstractWebContainer;
import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
@@ -44,7 +44,7 @@
@see org.jboss.web.AbstractWebContainer
@author [EMAIL PROTECTED]
-@version $Revision: 1.2.2.3 $
+@version $Revision: 1.2.2.4 $
*/
public class EmbeddedTomcatServiceSX extends AbstractWebContainer
implements EmbeddedTomcatServiceSXMBean
@@ -70,9 +70,9 @@
public void startService() throws Exception
{
- category.info("Starting " + NAME + "....");
+ log.info("Starting " + NAME + "....");
// Redirect the default logging to log4j
- PrintWriter writer = new PrintWriter(new CategoryStream(category,
Priority.DEBUG, System.out));
+ PrintWriter writer = new PrintWriter(new CategoryStream(log.getCategory(),
Priority.DEBUG, System.out));
Logger.setDefaultSink(writer);
String[] args = {};
@@ -91,7 +91,7 @@
{
Thread.currentThread().setContextClassLoader(cl);
}
- category.info("OK");
+ log.info("OK");
}
public void stopService()
@@ -113,7 +113,7 @@
protected WebApplication performDeploy(String ctxPath, String warUrl,
WebDescriptorParser webAppParser) throws Exception
{
- category.info("deploy, ctxPath="+ctxPath+", warUrl="+warUrl);
+ log.info("deploy, ctxPath="+ctxPath+", warUrl="+warUrl);
ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
// Create the container context in tomcat
Context ctx = tomcat.addRawContext(ctxPath, new URL(warUrl));
@@ -146,7 +146,7 @@
appInfo.setWebApp(webXml);
appInfo.setJbossWeb(jbossWebXml);
appInfo.setAppData(servletCtx);
- category.debug("Initialized: "+appInfo);
+ log.debug("Initialized: "+appInfo);
return appInfo;
}
1.1.4.2 +1 -3
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.4.1
retrieving revision 1.1.4.2
diff -u -r1.1.4.1 -r1.1.4.2
--- EmbeddedTomcatServiceSXMBean.java 2001/09/03 22:46:08 1.1.4.1
+++ EmbeddedTomcatServiceSXMBean.java 2001/11/20 09:49:00 1.1.4.2
@@ -4,10 +4,8 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
package org.jboss.tomcat;
-import org.jboss.ejb.DeploymentException;
import org.jboss.web.AbstractWebContainerMBean;
/**
@@ -15,7 +13,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.1.4.1 $
+ * @version $Revision: 1.1.4.2 $
*/
public interface EmbeddedTomcatServiceSXMBean extends AbstractWebContainerMBean
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
