costin 02/05/17 14:38:12
Modified: jk/java/org/apache/jk/config GeneratorApache2.java
GeneratorJk2.java
Log:
Few fixes to the configs.
Revision Changes Path
1.3 +10 -4
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorApache2.java
Index: GeneratorApache2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorApache2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeneratorApache2.java 2 May 2002 03:18:11 -0000 1.2
+++ GeneratorApache2.java 17 May 2002 21:38:12 -0000 1.3
@@ -174,6 +174,8 @@
out.println( " SetHandler jakarta-servlet2" );
out.println( " JkUriSet group " + worker );
out.println( " JkUriSet servlet " + servlet);
+ out.println( " JkUriSet host " + vhost );
+ out.println( " JkUriSet context " + cpath );
out.println( "</Location>");
out.println();
}
@@ -183,6 +185,8 @@
out.println( " SetHandler jakarta-servlet2" );
out.println( " JkUriSet group " + worker );
out.println( " JkUriSet servlet " + servlet);
+ out.println( " JkUriSet host " + vhost );
+ out.println( " JkUriSet context " + cpath );
out.println( "</Location>");
out.println();
}
@@ -192,6 +196,8 @@
out.println( "<Location \"" + cpath + loginPage + "\" >");
out.println( " SetHandler jakarta-servlet2" );
out.println( " JkUriSet group " + worker );
+ out.println( " JkUriSet host " + vhost );
+ out.println( " JkUriSet context " + cpath );
out.println( "</Location>");
out.println();
}
@@ -208,7 +214,7 @@
out.println( "<Location \"" + cpath + url + "\" >");
if( methods.size() > 0 ) {
- out.print("<Limit ");
+ out.print(" <Limit ");
for( int j=0; j<methods.size(); j++ ) {
String m=(String)methods.elementAt(j);
out.print( " " + m);
@@ -216,8 +222,8 @@
out.println( " >" );
}
- out.println( "AuthType basic" );
- out.print( "Require group " );
+ out.println( " AuthType basic" );
+ out.print( " Require group " );
for( int j=0; j<roles.size(); j++ ) {
String role=(String)roles.elementAt(j);
out.print( " " + role);
@@ -225,7 +231,7 @@
out.println();
if( methods.size() > 0 ) {
- out.println("</Limit>");
+ out.println(" </Limit>");
}
out.println( "</Location>");
1.3 +11 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk2.java
Index: GeneratorJk2.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeneratorJk2.java 1 May 2002 19:55:45 -0000 1.2
+++ GeneratorJk2.java 17 May 2002 21:38:12 -0000 1.3
@@ -125,9 +125,11 @@
}
public void generateServletMapping( String servlet, String url ) {
- out.println( "[url:" + vhost + cpath + url + "]");
+ out.println( "[uri:" + vhost + cpath + url + "]");
out.println( "group=" + worker );
out.println( "servlet=" + servlet);
+ out.println( "host=" + vhost);
+ out.println( "context=" + cpath);
out.println();
}
@@ -135,6 +137,8 @@
out.println( "[url:" + vhost + cpath + url + "]");
out.println( "group=" + worker );
out.println( "filter=" + servlet);
+ out.println( "host=" + vhost);
+ out.println( "context=" + cpath);
out.println();
}
@@ -142,9 +146,13 @@
String errPage, String authM ) {
out.println("[url:" + vhost + cpath + loginPage + "]" );
out.println( "group=" + worker );
+ out.println( "host=" + vhost);
+ out.println( "context=" + cpath);
out.println();
out.println("[url:" + vhost + cpath + errPage + "]" );
out.println( "group=" + worker );
+ out.println( "host=" + vhost);
+ out.println( "context=" + cpath);
out.println();
}
@@ -167,6 +175,8 @@
out.println("[url:" + vhost + cpath + url + "]");
out.println( "group=" + worker );
+ out.println( "host=" + vhost);
+ out.println( "context=" + cpath);
for( int j=0; j<roles.size(); j++ ) {
String role=(String)roles.elementAt(j);
out.println( "role=" + role);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
