[JBoss-dev] CVS update: contrib/catalina/src/main/org/jboss/web/catalina EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java
User: starksm
Date: 02/04/04 20:18:23
Modified:catalina/src/main/org/jboss/web/catalina Tag: Branch_2_4
EmbeddedCatalinaServiceSX.java
EmbeddedCatalinaServiceSXMBean.java
Log:
Add a CatalinaHome attribute for the catalina.home and catalina.base
System property values for use with non-standard catalina distribution
directory structures
Revision ChangesPath
No revision
No revision
1.2.2.7 +28 -22
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java
Index: EmbeddedCatalinaServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -r1.2.2.6 -r1.2.2.7
--- EmbeddedCatalinaServiceSX.java4 Apr 2002 08:22:28 - 1.2.2.6
+++ EmbeddedCatalinaServiceSX.java5 Apr 2002 04:18:23 - 1.2.2.7
@@ -57,16 +57,19 @@
import org.apache.catalina.startup.Embedded;
/** An implementation of the AbstractWebContainer for the Jakarta Tomcat
- 4.0 servlet container. This uses the Embedded as the integration class. It
- does not parse the catalina server.xml.
+ 4.0 servlet container. This uses the org.apache.catalina.startup.Embedded as
+ the integration class. It does not parse the catalina server.xml in the
+ catalina distribution. Rather, it parses a subset of the server.xml syntax
+ and obtains this configuration information from the Config attribute.
@see org.jboss.web.AbstractWebContainer
@see org.apache.catalina.startup.Embedded
@author [EMAIL PROTECTED]
- @version $Revision: 1.2.2.6 $
+ @version $Revision: 1.2.2.7 $
*/
-public class EmbeddedCatalinaServiceSX extends AbstractWebContainer implements
EmbeddedCatalinaServiceSXMBean
+public class EmbeddedCatalinaServiceSX extends AbstractWebContainer
+ implements EmbeddedCatalinaServiceSXMBean
{
// Constants -
public static final String NAME = EmbeddedCatalinaSX;
@@ -75,8 +78,8 @@
private EmbeddedCatalina catalina;
/** The catalina debug level */
private int debugLevel;
- /** The JNDI name of the SecurityDomain implementation binding */
- private String securityDomain;
+ /** The value to use for the catalina.home and catalina.base System properties */
+ private String catalinaHome;
/** Any extended configuration information specified via a config
element in the mbean definition.
*/
@@ -91,14 +94,14 @@
return NAME;
}
-public String getSecurityDomain()
-{
- return this.securityDomain;
-}
-public void setSecurityDomain(String securityDomain)
-{
- this.securityDomain = securityDomain;
-}
+ public String getCatalinaHome()
+ {
+ return this.catalinaHome;
+ }
+ public void setCatalinaHome(String catalinaHome)
+ {
+ this.catalinaHome = catalinaHome;
+ }
/** This method is invoked to import an arbitrary XML configuration tree.
Subclasses should override this method if they support such a configuration
@@ -134,14 +137,17 @@
try
{
// Set the catalina.home property from the Embedded class location
- ProtectionDomain pd = Embedded.class.getProtectionDomain();
- URL catalinaHome = pd.getCodeSource().getLocation();
- String homePath = catalinaHome.getFile();
- File homeDir = new File(homePath, ../../..);
- homePath = homeDir.getCanonicalPath();
- log.debug(Setting catalina.home to: + homePath);
- System.setProperty(catalina.home, homePath);
- System.setProperty(catalina.base, homePath);
+ if( catalinaHome == null )
+ {
+ProtectionDomain pd = Embedded.class.getProtectionDomain();
+URL catalinaHome = pd.getCodeSource().getLocation();
+String homePath = catalinaHome.getFile();
+File homeDir = new File(homePath, ../../..);
+catalinaHome = homeDir.getCanonicalPath();
+ }
+ log.debug(Setting catalina.home to: + catalinaHome);
+ System.setProperty(catalina.home, catalinaHome);
+ System.setProperty(catalina.base, catalinaHome);
initCatalina(cl);
catalina.start();
}
1.1.2.6 +11 -10
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java
Index: EmbeddedCatalinaServiceSXMBean.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java,v
retrieving
[JBoss-dev] CVS update: contrib/catalina/src/main/org/jboss/web/catalina EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java
User: starksm
Date: 02/02/15 10:06:00
Modified:catalina/src/main/org/jboss/web/catalina
EmbeddedCatalinaServiceSX.java
EmbeddedCatalinaServiceSXMBean.java
Log:
Fix the JSP compiler classpath.
Revision ChangesPath
1.5 +49 -3
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java
Index: EmbeddedCatalinaServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EmbeddedCatalinaServiceSX.java11 Feb 2002 23:03:35 - 1.4
+++ EmbeddedCatalinaServiceSX.java15 Feb 2002 18:06:00 - 1.5
@@ -16,6 +16,7 @@
import java.net.MalformedURLException;
import java.net.InetAddress;
import java.security.ProtectionDomain;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import javax.naming.InitialContext;
@@ -49,6 +50,7 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
@@ -58,7 +60,6 @@
import org.apache.catalina.connector.warp.WarpHost;
import org.apache.catalina.connector.warp.WarpEngine;
import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.loader.WebappClassLoader;
import org.apache.catalina.startup.Embedded;
/** An implementation of the AbstractWebContainer for the Jakarta Tomcat
@@ -69,7 +70,7 @@
@see org.apache.catalina.startup.Embedded
@author [EMAIL PROTECTED]
- @version $Revision: 1.4 $
+ @version $Revision: 1.5 $
*/
public class EmbeddedCatalinaServiceSX extends AbstractWebContainer implements
EmbeddedCatalinaServiceSXMBean
{
@@ -117,7 +118,7 @@
/** Get the Catalina home directory
*/
- public String GetCatalinaHome()
+ public String getCatalinaHome()
{
return catalinaHome;
}
@@ -269,6 +270,44 @@
}
}
+ /** Build an array of URL strings that will be used as the JSP compiler
+*classpath. As of Tomcat-4.0.2, this information is not being obtained
+*from the thread context classloader so we have to build it.
+*/
+ protected String[] getCompileClasspath(ClassLoader loader)
+ {
+ String[] jspResources = {
+ javax/servlet/resources/web-app_2_3.dtd,
+ org/apache/jasper/resources/jsp12.dtd,
+ javax/ejb/EJBHome.class
+ };
+ ArrayList tmp = new ArrayList();
+ for(int j = 0; j jspResources.length; j ++)
+ {
+ URL rsrcURL = loader.getResource(jspResources[j]);
+ if( rsrcURL != null )
+ {
+String url = rsrcURL.toExternalForm();
+if( rsrcURL.getProtocol().equals(jar) )
+{
+ // Parse the jar:url!/{entry} URL
+ url = url.substring(4);
+ int seperator = url.indexOf('!');
+ url = url.substring(0, seperator);
+}
+tmp.add(url);
+ }
+ else
+ {
+log.warn(Failed to fin jsp rsrc: +jspResources[j]);
+ }
+ }
+ log.debug(JSP CompileClasspath: + tmp);
+ String[] cp = new String[tmp.size()];
+ tmp.toArray(cp);
+ return cp;
+ }
+
/** Perform the tomcat specific deployment steps.
*/
protected WebApplication performDeploy(String ctxPath, String warUrl,
@@ -479,6 +518,13 @@
}
}
+ClassLoader rsrcLoader = Thread.currentThread().getContextClassLoader();
+String[] jspCP = getCompileClasspath(rsrcLoader);
+Loader ctxLoader = context.getLoader();
+for(int u = 0; u jspCP.length; u ++)
+{
+ ctxLoader.addRepository(jspCP[u]);
+}
// Apply any extended configuration to the context
// Get the web-app.xml and jboss-web.xml deployment descriptors
1.3 +2 -2
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java
Index: EmbeddedCatalinaServiceSXMBean.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbeddedCatalinaServiceSXMBean.java 11 Feb 2002 23:03:37 - 1.2
+++ EmbeddedCatalinaServiceSXMBean.java 15 Feb 2002 18:06:00 - 1.3
@@
[JBoss-dev] CVS update: contrib/catalina/src/main/org/jboss/web/catalina EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java
User: starksm
Date: 01/12/08 12:23:01
Modified:catalina/src/main/org/jboss/web/catalina Tag: Branch_2_4
EmbeddedCatalinaServiceSX.java
EmbeddedCatalinaServiceSXMBean.java
Log:
Change importXml to setConfig to work with attribute based configuration
Revision ChangesPath
No revision
No revision
1.2.2.5 +2 -2
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java
Index: EmbeddedCatalinaServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- EmbeddedCatalinaServiceSX.java2001/11/28 07:48:09 1.2.2.4
+++ EmbeddedCatalinaServiceSX.java2001/12/08 20:23:01 1.2.2.5
@@ -69,7 +69,7 @@
@see org.apache.catalina.startup.Embedded
@author [EMAIL PROTECTED]
- @version $Revision: 1.2.2.4 $
+ @version $Revision: 1.2.2.5 $
*/
public class EmbeddedCatalinaServiceSX extends AbstractWebContainer implements
EmbeddedCatalinaServiceSXMBean
{
@@ -203,7 +203,7 @@
Subclasses should override this method if they support such a configuration
capability. This implementation does nothing.
*/
-public void importXml(Element config)
+public void setConfig(Element config)
{
this.extendedConfig = config;
}
1.1.2.4 +2 -2
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java
Index: EmbeddedCatalinaServiceSXMBean.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSXMBean.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- EmbeddedCatalinaServiceSXMBean.java 2001/11/28 07:48:09 1.1.2.3
+++ EmbeddedCatalinaServiceSXMBean.java 2001/12/08 20:23:01 1.1.2.4
@@ -16,7 +16,7 @@
/** Management interface for the embedded Catalina service.
*
* @author [EMAIL PROTECTED]
- * @version $Revision: 1.1.2.3 $
+ * @version $Revision: 1.1.2.4 $
*/
public interface EmbeddedCatalinaServiceSXMBean extends AbstractWebContainerMBean
{
@@ -110,5 +110,5 @@
configuration using constructs from the standard server.xml to configure
additional connectors, etc.
*/
- public void importXml(Element config);
+ public void setConfig(Element config);
}
___
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
[JBoss-dev] CVS update: contrib/catalina/src/main/org/jboss/web/catalina EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java
User: starksm
Date: 01/11/27 23:48:09
Modified:catalina/src/main/org/jboss/web/catalina Tag: Branch_2_4
EmbeddedCatalinaServiceSX.java
EmbeddedCatalinaServiceSXMBean.java
Log:
Add support for setting the type of the primary connector. Currently
http or warp connectors are supported.
Revision ChangesPath
No revision
No revision
1.2.2.4 +74 -33
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java
Index: EmbeddedCatalinaServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- EmbeddedCatalinaServiceSX.java2001/11/20 09:54:18 1.2.2.3
+++ EmbeddedCatalinaServiceSX.java2001/11/28 07:48:09 1.2.2.4
@@ -19,6 +19,7 @@
import java.util.HashMap;
import java.util.Iterator;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletContext;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
@@ -53,6 +54,9 @@
import org.apache.catalina.Valve;
import org.apache.catalina.authenticator.AuthenticatorBase;
import org.apache.catalina.connector.http.HttpConnector;
+import org.apache.catalina.connector.warp.WarpConnector;
+import org.apache.catalina.connector.warp.WarpHost;
+import org.apache.catalina.connector.warp.WarpEngine;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.loader.WebappClassLoader;
import org.apache.catalina.startup.Embedded;
@@ -65,7 +69,7 @@
@see org.apache.catalina.startup.Embedded
@author [EMAIL PROTECTED]
- @version $Revision: 1.2.2.3 $
+ @version $Revision: 1.2.2.4 $
*/
public class EmbeddedCatalinaServiceSX extends AbstractWebContainer implements
EmbeddedCatalinaServiceSXMBean
{
@@ -76,8 +80,6 @@
private Embedded catalina;
/** The catalina host container */
private Host catalinaHost;
- /** The name of the Engine implementation class */
- private String engineClassName;
/** The catalina debug level */
private int debugLevel;
/** The port the web server listens on */
@@ -95,6 +97,8 @@
private int maxProcessors = 20;
/** The JNDI name of the SecurityDomain implementation binding */
private String securityDomain;
+ /** The type of connector that Tomcat will run (HTTP or WARP) */
+ private String connectorType = http;
/** Any extended configuration information specified via a config
element in the mbean definition.
*/
@@ -133,19 +137,21 @@
bindAddress = InetAddress.getByName(host);
}
- public String getEngineClass()
+ public String getConnectorType()
{
- return engineClassName;
+ return this.connectorType;
}
- public void setEngineClass(String className) throws ClassNotFoundException
+
+ public void setConnectorType(String type)
{
- this.engineClassName = className;
- if( engineClassName != null )
+ type = type.toLowerCase();
+ if( type.equals(http) == false type.equals(warp) == false )
{
- // Check that the class is accessible
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- loader.loadClass(engineClassName);
+ String msg= Invalid connector type: +connectorType
++ must be one of, http warp;
+ throw new IllegalArgumentException(msg);
}
+ this.connectorType = type;
}
public int getMinProcessors()
@@ -297,7 +303,7 @@
}
/** Create and configure a org.apache.catalina.startup.Embedded
-instance. Currently we do not use the server.xml file as we obtain all
+instance. We do not use the server.xml file as we obtain all
of the required customization from our mbean properties.
*/
private void initCatalina(ClassLoader parent) throws Exception
@@ -308,33 +314,39 @@
catalina.setDebug(debugLevel);
catalina.setUseNaming(false);
+ // Setup the primary engine and connector
+ if( connectorType.equals(http) )
+ initHttpConnector(parent, jbossLog, jbossRealm);
+ else if( connectorType.equals(warp) )
+ initWarpConnector(parent, jbossLog, jbossRealm);
+ else
+ throw new IllegalStateException(No valid connectorType);
+
+ // Apply any extended configuration
+ ConfigHandler handler = new ConfigHandler();
+ handler.applyHostConfig(extendedConfig, catalina, debugLevel 0);
+ }
+
+ private void initHttpConnector(ClassLoader parent, Logger jbossLog, Realm
[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 ChangesPath
No revision
No revision
1.2.2.3 +17 -17
contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.java
Index: EmbeddedCatalinaServiceSX.java
===
RCS file:
/cvsroot/jboss/contrib/catalina/src/main/org/jboss/web/catalina/EmbeddedCatalinaServiceSX.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.java2001/11/12 19:21:18 1.2.2.2
+++ EmbeddedCatalinaServiceSX.java2001/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
RE: [JBoss-dev] CVS update: contrib/catalina/src/main/org/jboss/web/catalina EmbeddedCatalinaServiceSX.java EmbeddedCatalinaServiceSXMBean.java Log4jLogger.java
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 ChangesPath
| 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
