costin 02/04/10 16:50:33
Modified: coyote/src/java/org/apache/coyote/tomcat3
CoyoteInterceptor2.java
coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
Log:
Set 'jkHome' with the server-specific values ( catalina.base or tomcat.home )
Revision Changes Path
1.9 +2 -0
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
Index: CoyoteInterceptor2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoyoteInterceptor2.java 10 Apr 2002 05:01:01 -0000 1.8
+++ CoyoteInterceptor2.java 10 Apr 2002 23:50:33 -0000 1.9
@@ -150,6 +150,8 @@
} catch( Exception ex ) {
ex.printStackTrace();
}
+
+ this.setAttribute("jkHome", cm.getHome());
proto.setAdapter( adapter );
try {
1.8 +5 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoyoteConnector.java 9 Apr 2002 22:27:11 -0000 1.7
+++ CoyoteConnector.java 10 Apr 2002 23:50:33 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.7 2002/04/09 22:27:11 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2002/04/09 22:27:11 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.8 2002/04/10 23:50:33 costin Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/10 23:50:33 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.7 $ $Date: 2002/04/09 22:27:11 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/10 23:50:33 $
*/
@@ -945,6 +945,7 @@
}
protocolHandler.setAdapter(adapter);
+ IntrospectionUtils.setProperty(protocolHandler, "jkHome",
System.getProperty("catalina.base"));
// Set attributes
IntrospectionUtils.setProperty(protocolHandler, "port", "" + port);
IntrospectionUtils.setProperty(protocolHandler, "maxThreads",
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
