User: salborini
Date: 00/11/02 10:02:46
Modified: tomcat/src/main/org/jboss/tomcat
ContextClassLoaderInterceptor.java
EmbeddedTomcatService.java
EmbeddedTomcatServiceMBean.java
Log:
JNDI and security integration for EmbeddedTomcatService
Submitted by Kevin Lewis <[EMAIL PROTECTED]>
Revision Changes Path
1.2 +1 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextClassLoaderInterceptor.java 2000/10/23 19:35:42 1.1
+++ ContextClassLoaderInterceptor.java 2000/11/02 18:02:45 1.2
@@ -18,7 +18,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ContextClassLoaderInterceptor extends BaseInterceptor {
1.2 +51 -27
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmbeddedTomcatService.java 2000/10/23 19:35:42 1.1
+++ EmbeddedTomcatService.java 2000/11/02 18:02:45 1.2
@@ -48,7 +48,8 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @author <a href="mailto:[EMAIL PROTECTED]">Kevin Lewis</a>
+ * @version $Revision: 1.2 $
*/
public class EmbeddedTomcatService extends ServiceMBeanSupport
implements EmbeddedTomcatServiceMBean, MBeanRegistration {
@@ -59,7 +60,7 @@
// Attributes ----------------------------------------------------
// the tomcat launcher
- EmbededTomcat embededTomcat;
+ private EmbededTomcat embededTomcat;
// the path to tomcat. We need it to set the root context
String tomcatHome;
@@ -131,7 +132,7 @@
embededTomcat.setWorkDir(tomcatHome);
// set the interceptors.
- addInterceptors();
+ addInterceptors(embededTomcat);
// add root context
deploy("/", "file:" + tomcatHome + "/webapps/ROOT");
@@ -209,65 +210,88 @@
// Protected -----------------------------------------------------
- // Private -------------------------------------------------------
- private void addInterceptors() {
-
+ protected void addContextInterceptors(EmbededTomcat tomcat) {
// Since we add one non-default interceptor, we have to specif them all
// the list comes from org.apache.tomcat.startup.EmbededTomcat
WebXmlReader webXmlI=new WebXmlReader();
webXmlI.setValidate( false );
- embededTomcat.addContextInterceptor( webXmlI );
-
+ tomcat.addContextInterceptor( webXmlI );
+
PolicyInterceptor polI=new PolicyInterceptor();
- embededTomcat.addContextInterceptor( polI );
+ tomcat.addContextInterceptor( polI );
polI.setDebug(0);
LoaderInterceptor loadI=new LoaderInterceptor();
- embededTomcat.addContextInterceptor( loadI );
+ tomcat.addContextInterceptor( loadI );
- // this one is custom
+ tomcat.addContextInterceptor( new
org.jboss.tomcat.naming.JbossWebXmlReader() );
+
ContextClassLoaderInterceptor ccli = new
ContextClassLoaderInterceptor();
- embededTomcat.addContextInterceptor(ccli);
+ tomcat.addContextInterceptor(ccli);
DefaultCMSetter defaultCMI=new DefaultCMSetter();
- embededTomcat.addContextInterceptor( defaultCMI );
+ tomcat.addContextInterceptor( defaultCMI );
WorkDirInterceptor wdI=new WorkDirInterceptor();
- embededTomcat.addContextInterceptor( wdI );
+ tomcat.addContextInterceptor( wdI );
-
LoadOnStartupInterceptor loadOnSI=new LoadOnStartupInterceptor();
- embededTomcat.addContextInterceptor( loadOnSI );
-
+ tomcat.addContextInterceptor( loadOnSI );
+ }
+
+ protected void addSecurityRequestInterceptors(EmbededTomcat tomcat) {
+ }
+
+ protected void addRequestInterceptors(EmbededTomcat tomcat) {
// Debug
// LogEvents logEventsI=new LogEvents();
// addRequestInterceptor( logEventsI );
+ // this one is custom
+ // set context class loader
+ // New interceptor.
+ tomcat.addRequestInterceptor( new
org.jboss.tomcat.naming.JndiRequestInterceptor() );
+
SessionInterceptor sessI=new SessionInterceptor();
- embededTomcat.addRequestInterceptor( sessI );
+ tomcat.addRequestInterceptor( sessI );
SimpleMapper1 mapI=new SimpleMapper1();
- embededTomcat.addRequestInterceptor( mapI );
+ tomcat.addRequestInterceptor( mapI );
mapI.setDebug(0);
InvokerInterceptor invI=new InvokerInterceptor();
- embededTomcat.addRequestInterceptor( invI );
+ tomcat.addRequestInterceptor( invI );
invI.setDebug(0);
StaticInterceptor staticI=new StaticInterceptor();
- embededTomcat.addRequestInterceptor( staticI );
+ tomcat.addRequestInterceptor( staticI );
mapI.setDebug(0);
- embededTomcat.addRequestInterceptor( new StandardSessionInterceptor());
+ tomcat.addRequestInterceptor( new StandardSessionInterceptor());
// access control ( find if a resource have constraints )
AccessInterceptor accessI=new AccessInterceptor();
- embededTomcat.addRequestInterceptor( accessI );
+ tomcat.addRequestInterceptor( accessI );
accessI.setDebug(0);
-
- // set context class loader
- Jdk12Interceptor jdk12I=new Jdk12Interceptor();
- embededTomcat.addRequestInterceptor( jdk12I );
+
+ //Jdk12Interceptor jdk12I=new Jdk12Interceptor();
+ //tomcat.addRequestInterceptor( jdk12I );
+
+ addSecurityRequestInterceptors(tomcat);
+ }
+
+ // Private -------------------------------------------------------
+
+ private void addInterceptors(EmbededTomcat tomcat) {
+
+ try {
+ addContextInterceptors(tomcat);
+ addRequestInterceptors(tomcat);
+ }
+ catch (Throwable e) {
+ System.out.println("Error initializing embedded Tomcat service.");
+ e.printStackTrace(System.out);
+ }
}
}
1.2 +1 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EmbeddedTomcatServiceMBean.java 2000/10/23 19:35:43 1.1
+++ EmbeddedTomcatServiceMBean.java 2000/11/02 18:02:45 1.2
@@ -16,7 +16,7 @@
*
* @see <related>
* @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface EmbeddedTomcatServiceMBean extends org.jboss.util.ServiceMBean {
