costin 02/01/11 20:20:43
Modified: jk/java/org/apache/jk/server/tomcat33 JkServlet33.java
Added: jk/java/org/apache/jk/server/tomcat33 JkConfig33.java
Log:
Few fixes, added the template for the config extractor.
Revision Changes Path
1.2 +21 -32
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkServlet33.java
Index: JkServlet33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkServlet33.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkServlet33.java 6 Jan 2002 08:52:38 -0000 1.1
+++ JkServlet33.java 12 Jan 2002 04:20:43 -0000 1.2
@@ -87,40 +87,29 @@
{
}
- public void init(ServletConfig conf) throws ServletException {
- d("init");
- }
-
- public void destroy() {
- d("Shuting down");
- }
-
public void initializeContainer(ServletConfig cfg) {
- d("Initializing 4.0 for jk requests");
-
- ServletContext sctx=cfg.getServletContext();
- Context ctx=(Context)sctx.getAttribute( Context.ATTRIB_REAL_CONTEXT );
- if( ctx==null ) {
- d("Untrusted app or error, ctx==null ");
- return;
- }
- cm=ctx.getContextManager();
-
- // We now have control over the whole thing !
-
- // We could register an interceptor to be notified
- registerInterceptors();
-
- // start Jk
- JkMain jkMain=new JkMain();
- jkMain.setProperties( servletConfig2properties( cfg ));
- Worker33 worker=new Worker33();
- worker.setContextManager( cm );
- jkMain.setDefaultWorker( worker );
-
try {
- jkMain.start();
- } catch( Exception ex ) {
+ ServletContext sctx=cfg.getServletContext();
+ Context ctx=(Context)sctx.getAttribute( Context.ATTRIB_REAL_CONTEXT );
+ if( ctx==null ) {
+ d("Untrusted app or error, ctx==null ");
+ return;
+ }
+ cm=ctx.getContextManager();
+
+ // We now have control over the whole thing !
+
+ // We could register an interceptor to be notified
+ registerInterceptors();
+
+ Worker33 worker=new Worker33();
+ worker.setContextManager( cm );
+
+ d("Initializing tomcat3.3 for jk requests");
+
+ // start Jk
+ initJkMain(cfg, worker);
+ } catch( Throwable ex ) {
ex.printStackTrace();
}
}
1.1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkConfig33.java
Index: JkConfig33.java
===================================================================
/*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* [Additional notices, if required by prior licensing conditions]
*
*/
package org.apache.jk.server.tomcat33;
import java.io.*;
import java.net.*;
import java.util.*;
import org.apache.jk.*;
import org.apache.jk.core.*;
import org.apache.jk.common.*;
import org.apache.tomcat.modules.server.PoolTcpConnector;
import org.apache.tomcat.core.*;
import org.apache.tomcat.util.net.*;
import org.apache.tomcat.util.buf.*;
import org.apache.tomcat.util.log.*;
import org.apache.tomcat.util.http.*;
import org.apache.jk.core.*;
/**
* Keep jk config in sync with 3.3. Used to generate the
* config and ( in a distant future ) support dynamic
* deploy, etc.
*
*/
public class JkConfig33 extends BaseInterceptor
{
public JkConfig33()
{
super();
}
private static final int dL=0;
private static void d(String s ) {
System.err.println( "JkConfig33: " + s );
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
