billbarker 01/12/11 20:09:35
Modified: jk/java/org/apache/ajp/tomcat4/config ApacheConfig.java
IISConfig.java NSConfig.java
Log:
Add missing j_security_check mapping.
It seems that this isn't a mapped servlet in 4.x.
Revision Changes Path
1.3 +8 -0
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/ApacheConfig.java
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/ApacheConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApacheConfig.java 2001/12/11 03:52:35 1.2
+++ ApacheConfig.java 2001/12/12 04:09:35 1.3
@@ -446,6 +446,14 @@
// XXX we need to better collect all mappings
+ if(context.getLoginConfig() != null) {
+ String loginPage = context.getLoginConfig().getLoginPage();
+ if(loginPage != null) {
+ int lpos = loginPage.lastIndexOf("/");
+ String jscurl = loginPage.substring(0,lpos+1) + "j_security_check";
+ addMapping( ctxPath, jscurl, mod_jk);
+ }
+ }
String [] servletMaps = context.findServletMappings();
for(int ii=0; ii < servletMaps.length; ii++) {
addMapping( ctxPath, servletMaps[ii] , mod_jk );
1.3 +9 -1
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/IISConfig.java
Index: IISConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/IISConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IISConfig.java 2001/12/11 03:52:35 1.2
+++ IISConfig.java 2001/12/12 04:09:35 1.3
@@ -283,7 +283,15 @@
// XXX we need to better collect all mappings
- String [] servletMaps=context.findServletMappings();
+ if(context.getLoginConfig() != null) {
+ String loginPage = context.getLoginConfig().getLoginPage();
+ if(loginPage != null) {
+ int lpos = loginPage.lastIndexOf("/");
+ String jscurl = loginPage.substring(0,lpos+1) + "j_security_check";
+ addMapping( ctxPath, jscurl, uri_worker);
+ }
+ }
+ String [] servletMaps=context.findServletMappings();
for( int ii=0; ii < servletMaps.length ; ii++) {
addMapping( ctxPath , servletMaps[ii] , uri_worker );
}
1.3 +9 -1
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/NSConfig.java
Index: NSConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/NSConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NSConfig.java 2001/12/11 03:52:35 1.2
+++ NSConfig.java 2001/12/12 04:09:35 1.3
@@ -318,7 +318,15 @@
// but it's implemented using a special module.
// XXX we need to better collect all mappings
-
+ if(context.getLoginConfig() != null) {
+ String loginPage = context.getLoginConfig().getLoginPage();
+ if(loginPage != null) {
+ int lpos = loginPage.lastIndexOf("/");
+ String jscurl = loginPage.substring(0,lpos+1) + "j_security_check";
+ addMapping( ctxPath, jscurl, objfile);
+ }
+ }
+
String [] servletMaps=context.findServletMappings();
for(int ii=0; ii < servletMaps.length; ii++) {
addMapping( ctxPath , servletMaps[ii] , objfile );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
