costin 02/01/11 20:25:14
Modified: jk/java/org/apache/jk/server JkMain.java JkServlet.java
Log:
Few fixes. 4.x can't be starte from a servlet ( I tried with 4.1 as well, no luck )
but it uses server.xml
Revision Changes Path
1.4 +11 -2
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java
Index: JkMain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkMain.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JkMain.java 6 Jan 2002 08:50:56 -0000 1.3
+++ JkMain.java 12 Jan 2002 04:25:14 -0000 1.4
@@ -82,7 +82,8 @@
Properties props;
Worker defaultWorker;
-
+ String jkHome;
+
public JkMain()
{
}
@@ -104,10 +105,18 @@
public void setDefaultWorker( Worker w ) {
defaultWorker=w;
}
+
+ public void setJkHome( String s ) {
+ jkHome=s;
+ }
public void start() throws IOException {
ChannelUn csocket=new ChannelUn();
- csocket.setFile( "/tmp/tomcatApr" );
+// if( jkHome==null )
+ csocket.setFile( "/tmp/tomcatUnixSocket" );
+// else
+// csocket.setFile( jkHome + "/WEB-INF/tomcatUnixSocket" );
+ csocket.setJkHome( jkHome );
/* ChannelSocket csocket=new ChannelSocket();
csocket.setPort( 8009 );
*/
1.3 +35 -7
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkServlet.java
Index: JkServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JkServlet.java 6 Jan 2002 08:50:56 -0000 1.2
+++ JkServlet.java 12 Jan 2002 04:25:14 -0000 1.3
@@ -85,7 +85,8 @@
/* Parameters for the ajp channel */
String port;
String host; /* If it starts with '/' we'll use ud */
- ServletContext sctx;
+ protected ServletContext sctx;
+ protected ServletConfig sconf;
public JkServlet()
{
@@ -93,6 +94,10 @@
protected Properties servletConfig2properties(ServletConfig conf ) {
Properties props=new Properties();
+ if( conf==null ) {
+ d("No config ");
+ return props;
+ }
Enumeration paramNE=conf.getInitParameterNames();
while( paramNE.hasMoreElements() ){
String s=(String)paramNE.nextElement();
@@ -105,9 +110,14 @@
public void init(ServletConfig conf) throws ServletException {
- super.init(conf);
- sctx=conf.getServletContext();
- getServletAdapter();
+ try {
+ super.init(conf);
+ sconf=conf;
+ sctx=conf.getServletContext();
+ getServletAdapter();
+ } catch( Throwable t ) {
+ t.printStackTrace();
+ }
}
/* Ok, this is a bit hacky - there is ( or I couldn't find ) any clean
@@ -119,7 +129,7 @@
the internals.
*/
private void getServletAdapter() {
- try40();
+ // try40();
try33();
}
@@ -132,8 +142,8 @@
return;
}
t33.initializeContainer( getServletConfig());
- } catch( Exception ex ) {
- ex.printStackTrace();
+ } catch( Throwable ex ) {
+ d("3.3 intialization failed " + ex.toString());
}
}
@@ -159,6 +169,24 @@
ex.printStackTrace();
// ignore it - what would you expect, we pass dummy objects
}
+ } catch( Exception ex ) {
+ ex.printStackTrace();
+ }
+ }
+
+ protected JkMain jkMain;
+
+ protected void initJkMain(ServletConfig cfg, Worker defaultWorker) {
+ jkMain=new JkMain();
+ jkMain.setProperties( servletConfig2properties( cfg ));
+ jkMain.setDefaultWorker( defaultWorker );
+
+ String jkHome=cfg.getServletContext().getRealPath("/");
+ d("Setting jkHome " + jkHome );
+ jkMain.setJkHome( jkHome );
+
+ try {
+ jkMain.start();
} catch( Exception ex ) {
ex.printStackTrace();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
