*** empty log message ***

3 files changed, 74 insertions, 4 deletions

diff --git a/net-www/apache-ssl/files/httpd.conf b/net-www/apache-ssl/files/httpd.conf
index 74932d151faf..6d6105525ef1 100644
--- a/net-www/apache-ssl/files/httpd.conf
+++ b/net-www/apache-ssl/files/httpd.conf
@@ -474,7 +474,7 @@ DocumentRoot "/usr/local/httpd/htdocs"
 # directory index.  Separate multiple entries with spaces.
 #
 <IfModule mod_dir.c>
-    DirectoryIndex index.html
+    DirectoryIndex index.html index.htm
 </IfModule>
 
 #
@@ -1286,6 +1286,14 @@ CustomLog /var/log/apache/ssl_request_log \
 </IfDefine>
 
 <IfDefine TOMCAT>
-Include /etc/httpd/tomcat.conf
+Include /etc/httpd/httpd.tomcat
+</IfDefine>
+
+<IfDefine MODLOGAN>
+Include /etc/httpd/httpd.modlogan
+</IfDefine>
+
+<IfDefine WEBALIZER>
+Include /etc/httpd/httpd.webalizer
 </IfDefine>
 
diff --git a/net-www/jakarta/files/httpd.tomcat b/net-www/jakarta/files/httpd.tomcat
new file mode 100644
index 000000000000..cfa38e63e43f
--- /dev/null
+++ b/net-www/jakarta/files/httpd.tomcat
@@ -0,0 +1,62 @@
+###############################################################################
+#                     Apache JServ Configuration File                         #
+###############################################################################
+
+# Note: this file should be appended or included into your httpd.conf
+
+# Tell Apache on Unix to load the Apache JServ communication module
+# For shared object builds only!!!
+# @LOAD_OR_NOT@LoadModule jserv_module @LIBEXECDIR@/mod_jserv.so
+LoadModule jserv_module libexec/mod_jserv.so
+
+<IfModule mod_jserv.c>
+# Do not edit!
+ApJServManual on
+ApJServDefaultProtocol ajpv12
+ApJServSecretKey DISABLED
+ApJServMountCopy on
+ApJServLogLevel notice
+
+
+### Change if you run tomcat on a different host
+#ApJServDefaultHost localhost
+ApJServDefaultPort 8007
+
+
+#################### All jsp files will go to tomcat ####################
+ApJServMount default /root
+ 
+AddType text/jsp .jsp
+AddHandler jserv-servlet .jsp
+
+############################## Context mapping - all requests go to tomcat
+
+ApJServMount /examples /root
+
+############################## Context mapping - you need to "deploy"
+# ( copy or ln -s ) the context into htdocs
+##
+
+# ApJservMount /CONTEXT/servlet  /root
+# <Location /CONTEXT/WEB-INF/ >
+#      AllowOverride None
+#      deny from all
+# </Location>  
+
+<IfDefine COCOON>
+
+Alias /cocoon /opt/tomcat/webapps/cocoon
+<Directory "/opt/tomcat/webapps/cocoon">
+  Options Indexes FollowSymLinks
+</Directory>
+ApJServMount /cocoon /cocoon
+AddType text/xml .xml
+AddHandler jserv-servlet .xml
+<Location /cocoon/WEB_INF/ >
+  AllowOverride None
+  deny from all
+</Location>
+
+</IfDefine>
+
+</IfModule>
diff --git a/net-www/jakarta/jakarta-3.1-r2.ebuild b/net-www/jakarta/jakarta-3.1-r2.ebuild
index 95250477f41c..7e2c401891cb 100644
--- a/net-www/jakarta/jakarta-3.1-r2.ebuild
+++ b/net-www/jakarta/jakarta-3.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r2.ebuild,v 1.1 2001/01/16 00:36:21 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r2.ebuild,v 1.2 2001/01/19 22:07:16 achim Exp $
 
 P=jakarta-3.1
 A="jakarta-tomcat.tar.gz jakarta-ant.tar.gz"
@@ -47,7 +47,7 @@ src_install() {
   insinto /usr/lib/apache
   doins ${S}/jakarta-tomcat/src/native/apache/jserv/mod_jserv.so
   insinto /etc/httpd
-  doins ${O}/files/tomcat.conf
+  doins ${O}/files/httpd.tomcat
   insinto /etc/rc.d/init.d
   insopts -m755
   doins ${O}/files/jakarta