cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/config GeneratorApache2.java GeneratorJk2.java
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 ChangesPath
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 - 1.2
+++ GeneratorApache2.java 17 May 2002 21:38:12 - 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; jmethods.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; jroles.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 - 1.2
+++ GeneratorJk2.java 17 May 2002 21:38:12 - 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; jroles.size(); j++ ) {
String
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/config GeneratorApache2.java GeneratorJk1.java GeneratorJk2.java WebXml2Jk.java
costin 02/05/01 12:55:46
Modified:jk/java/org/apache/jk/config GeneratorJk1.java
GeneratorJk2.java WebXml2Jk.java
Added: jk/java/org/apache/jk/config GeneratorApache2.java
Log:
Few more updates.
Generate all possible config files.
The Apache2-jk2 config is experimental ( for the 'native' mapper ),
but it uses the native apache modules to support Wellcome-Files,
it has correct security mappings, etc.
Revision ChangesPath
1.2 +15 -10
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk1.java
Index: GeneratorJk1.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/GeneratorJk1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeneratorJk1.java 1 May 2002 17:00:18 - 1.1
+++ GeneratorJk1.java 1 May 2002 19:55:45 - 1.2
@@ -103,6 +103,7 @@
String vhost;
String cpath;
String worker;
+PrintWriter out;
public void setWebXmlReader(WebXml2Jk wxml ) {
this.wxml=wxml;
@@ -111,42 +112,46 @@
worker=wxml.worker;
}
-public void generateStart(PrintWriter out ) {
+public void generateStart( ) throws IOException {
+File base=wxml.getJkDir();
+File outF=new File(base, jk.conf);
+out=new PrintWriter( new FileWriter( outF ));
+
out.println(# This must be included in the virtual host section for +
vhost );
}
-public void generateEnd(PrintWriter out ) {
-
+public void generateEnd() {
+out.close();
}
-public void generateServletMapping( PrintWriter out, String servlet, String url
) {
+public void generateServletMapping( String servlet, String url ) {
out.println( JkMount + cpath + url + + worker);
}
-public void generateFilterMapping( PrintWriter out, String servlet, String url
) {
+public void generateFilterMapping( String servlet, String url ) {
out.println( JkMount + cpath + url + + worker);
}
-public void generateLoginConfig( PrintWriter out, String loginPage,
+public void generateLoginConfig( String loginPage,
String errPage, String authM ) {
out.println( JkMount + cpath + loginPage + + worker);
}
-public void generateErrorPage( PrintWriter out, int err, String location ) {
+public void generateErrorPage( int err, String location ) {
}
-public void generateMimeMapping( PrintWriter out, String ext, String type ) {
+public void generateMimeMapping( String ext, String type ) {
}
-public void generateWelcomeFiles( PrintWriter out, Vector wf ) {
+public void generateWelcomeFiles( Vector wf ) {
}
-public void generateConstraints( PrintWriter out, Vector urls, Vector methods,
Vector roles, boolean isSSL ) {
+public void generateConstraints( Vector urls, Vector methods, Vector roles,
boolean isSSL ) {
for( int i=0; iurls.size(); i++ ) {
String url=(String)urls.elementAt(i);
1.2 +18 -12
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeneratorJk2.java 1 May 2002 17:00:18 - 1.1
+++ GeneratorJk2.java 1 May 2002 19:55:45 - 1.2
@@ -103,6 +103,7 @@
String vhost;
String cpath;
String worker;
+PrintWriter out;
public void setWebXmlReader(WebXml2Jk wxml ) {
this.wxml=wxml;
@@ -111,28 +112,33 @@
worker=wxml.worker;
}
-public void generateStart(PrintWriter out ) {
+public void generateStart( ) throws IOException {
+File base=wxml.getJkDir();
+File outF=new File(base, jk2map.properties);
+out=new PrintWriter( new FileWriter( outF ));
+
out.println(# Autogenerated from web.xml );
}
-public void generateEnd(PrintWriter out ) {
-
+public void generateEnd() {
+out.close();
}
-public void generateServletMapping( PrintWriter out, String servlet, String url
) {
+
+public void generateServletMapping( String servlet, String url ) {
out.println( [url: + vhost + cpath + url + ]);
out.println( group= + worker );
out.println( servlet= + servlet);
out.println();
}
-public void
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/config GeneratorApache2.java
costin 02/05/01 20:18:11
Modified:jk/java/org/apache/jk/config GeneratorApache2.java
Log:
Few fixes
Revision ChangesPath
1.2 +11 -7
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeneratorApache2.java 1 May 2002 19:55:45 - 1.1
+++ GeneratorApache2.java 2 May 2002 03:18:11 - 1.2
@@ -171,24 +171,28 @@
public void generateServletMapping( String servlet, String url ) {
out.println( Location \ + cpath + url + \ );
-out.println( SetHandler jakarta-servlet2 );
-out.println( JkSet worker + worker );
-out.println( JkSet servlet + servlet);
+out.println( SetHandler jakarta-servlet2 );
+out.println( JkUriSet group + worker );
+out.println( JkUriSet servlet + servlet);
out.println( /Location);
out.println();
}
public void generateFilterMapping( String servlet, String url ) {
out.println( Location \ + cpath + url + \ );
-out.println( SetHandler jakarta-servlet2 );
-out.println( JkSet worker + worker );
-out.println( JkSet servlet + servlet);
+out.println( SetHandler jakarta-servlet2 );
+out.println( JkUriSet group + worker );
+out.println( JkUriSet servlet + servlet);
out.println( /Location);
out.println();
}
public void generateLoginConfig( String loginPage,
-String errPage, String authM ) {
+ String errPage, String authM ) {
+out.println( Location \ + cpath + loginPage + \ );
+out.println( SetHandler jakarta-servlet2 );
+out.println( JkUriSet group + worker );
+out.println( /Location);
out.println();
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
