User: oberg
Date: 00/12/07 07:39:14
Modified: tomcat/src/main/org/jboss/tomcat
ContextClassLoaderInterceptor.java
EmbeddedTomcatService.java
EmbeddedTomcatServiceMBean.java
Log:
Added default constructor
Revision Changes Path
1.4 +3 -2
contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java
Index: ContextClassLoaderInterceptor.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/tomcat/src/main/org/jboss/tomcat/ContextClassLoaderInterceptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContextClassLoaderInterceptor.java 2000/11/15 02:01:26 1.3
+++ ContextClassLoaderInterceptor.java 2000/12/07 15:39:13 1.4
@@ -12,13 +12,14 @@
import org.apache.tomcat.core.BaseInterceptor;
import org.apache.tomcat.core.TomcatException;
import org.apache.tomcat.core.Context;
+import org.apache.tomcat.loader.AdaptiveClassLoader;
/**
* <description>
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ContextClassLoaderInterceptor extends BaseInterceptor {
@@ -27,7 +28,7 @@
public void contextInit( Context context) throws TomcatException {
-
context.getServletLoader().setParentLoader(Thread.currentThread().getContextClassLoader());
+
context.getServletLoader().setParentLoader(Thread.currentThread().getContextClassLoader());
context.getContextManager().setWorkDir("work");
}
1.7 +47 -10
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java
Index: EmbeddedTomcatService.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EmbeddedTomcatService.java 2000/12/03 00:19:46 1.6
+++ EmbeddedTomcatService.java 2000/12/07 15:39:13 1.7
@@ -46,8 +46,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-
-
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
@@ -66,7 +64,7 @@
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin Lewis</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class EmbeddedTomcatService extends ServiceMBeanSupport
implements EmbeddedTomcatServiceMBean, MBeanRegistration {
@@ -98,11 +96,37 @@
// Constructors --------------------------------------------------
- public EmbeddedTomcatService(String configFile, int port) {
- this.configFile = configFile;
+ public EmbeddedTomcatService()
+ {
+ this(null, 8080);
+ }
+
+ public EmbeddedTomcatService(String configFile, int port)
+ {
+ this.configFile = configFile;
this.port = port;
+ }
+
+ public void setPort(int port)
+ {
+ this.port = port;
+ }
+
+ public int getPort()
+ {
+ return port;
}
-
+
+ public void setConfigFile(String configFile)
+ {
+ this.configFile = configFile;
+ }
+
+ public String getConfigFile()
+ {
+ return configFile;
+ }
+
// Public --------------------------------------------------------
public ObjectName getObjectName(MBeanServer server, ObjectName name)
throws javax.management.MalformedObjectNameException {
@@ -138,6 +162,13 @@
URL tomcatUrl =
tomcatClass.getProtectionDomain().getCodeSource().getLocation();
tomcatHome = new File(new
File(tomcatUrl.getFile()).getParent()).getParent();
+
+ // Locate server.xml
+ if (configFile == null)
+ {
+ configFile = new File(tomcatHome, "conf/server.xml").toString();
+ System.out.println("Config file set to:"+configFile);
+ }
try {
@@ -171,15 +202,17 @@
// add contexts from file
// Create an instance of the DocumentBuilderFactory
- DocumentBuilderFactory docBuilderFactory =
DocumentBuilderFactory.newInstance();
+
System.out.println(Class.forName("javax.xml.parsers.DocumentBuilderFactory"));
+
+ com.sun.xml.parser.DocumentBuilderFactoryImpl docBuilderFactory = new
com.sun.xml.parser.DocumentBuilderFactoryImpl();
//Get the DocumentBuilder from the factory that we just got above.
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+ com.sun.xml.parser.DocumentBuilderImpl docBuilder =
(com.sun.xml.parser.DocumentBuilderImpl)docBuilderFactory.newDocumentBuilder();
// parse the config file
// ROB: it�s not bulletproof maybe should validate against a dtd file
Document doc = docBuilder.parse(new File(configFile));
-
+
// get list with contexts
NodeList contexts = doc.getElementsByTagName("Context");
@@ -243,7 +276,11 @@
// keep track of deployed contexts for undeployment
deployedURLs.put(warUrl, servletCtx);
- } catch (Exception e) {
+ } catch (Error e)
+ {
+ e.printStackTrace();
+ throw e;
+ } catch (Exception e) {
e.printStackTrace();
throw new DeploymentException(e.getMessage());
} finally {
1.3 +7 -1
contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceMBean.java
Index: EmbeddedTomcatServiceMBean.java
===================================================================
RCS file:
/products/cvs/ejboss/contrib/tomcat/src/main/org/jboss/tomcat/EmbeddedTomcatServiceMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EmbeddedTomcatServiceMBean.java 2000/11/02 18:02:45 1.2
+++ EmbeddedTomcatServiceMBean.java 2000/12/07 15:39:13 1.3
@@ -16,7 +16,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public interface EmbeddedTomcatServiceMBean extends org.jboss.util.ServiceMBean {
@@ -24,6 +24,12 @@
public static final String OBJECT_NAME = ":service=EmbeddedTomcat";
// Public --------------------------------------------------------
+ public void setPort(int port);
+ public int getPort();
+
+ public void setConfigFile(String configFile);
+ public String getConfigFile();
+
public void deploy(String ctxPath, String warUrl) throws DeploymentException;
public void undeploy(String warUrl) throws DeploymentException;
