diff options
| author |   Achim Gottinger <achim@gentoo.org> | 2001-01-05 07:58:48 +0000 |
|---|---|---|
| committer | Achim Gottinger <achim@gentoo.org> | 2001-01-05 07:58:48 +0000 |
| commit | 38f54c48b70380d7eeaf7b63ec61956efe20641c (patch) | |
| tree | 2646eece673c251964f43a53a75c795e904eafb2 /net-www | |
| parent | *** empty log message *** (diff) | |
| download | historical-38f54c48b70380d7eeaf7b63ec61956efe20641c.tar.gz historical-38f54c48b70380d7eeaf7b63ec61956efe20641c.tar.bz2 historical-38f54c48b70380d7eeaf7b63ec61956efe20641c.zip | |
Update related fixes.
httpd.conf now uses IfDefine for SSL PHP4 PERL TOMCAT COCOON
cocoon examples now get installed into /opt/tomcat/webapps/cocoon and can be
accessed via http://localhost/cocoon/samles/index.xml
A statuspage is located at http://localhost/cocoon/Cocoon.xml
Tomcat still writes its log files to /usr/local/httpd/logs and /opt/tomcat/logs
this must be change
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/apache-ssl/files/httpd.conf | 39 | ||||
| -rw-r--r-- | net-www/cocoon/cocoon-1.8.ebuild | 16 | ||||
| -rw-r--r-- | net-www/cocoon/files/cocoon.properties | 71 | ||||
| -rwxr-xr-x | net-www/jakarta/files/jakarta | 28 | ||||
| -rw-r--r-- | net-www/jakarta/files/tomcat.conf | 20 | ||||
| -rw-r--r-- | net-www/jakarta/files/web.xml | 1260 | ||||
| -rw-r--r-- | net-www/jakarta/jakarta-3.1-r1.ebuild | 18 |
7 files changed, 741 insertions, 711 deletions
diff --git a/net-www/apache-ssl/files/httpd.conf b/net-www/apache-ssl/files/httpd.conf index 91a45e59bc01..444d3d7f9b39 100644 --- a/net-www/apache-ssl/files/httpd.conf +++ b/net-www/apache-ssl/files/httpd.conf @@ -241,12 +241,15 @@ LoadModule usertrack_module /usr/lib/apache/mod_usertrack.so LoadModule example_module /usr/lib/apache/mod_example.so LoadModule unique_id_module /usr/lib/apache/mod_unique_id.so LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so + <IfDefine PERL> LoadModule perl_module /usr/lib/apache/libperl.so </IfDefine> -#LoadModule php4_module /usr/lib/apache/libphp4.so -#LoadModule jserv_module /usr/lib/apache/mod_jserv.so -#LoadModule zmod_module /usr/lib/apache/mod_zmod.so +<IfDefine PHP4> +LoadModule php4_module /usr/lib/apache/libphp4.so +<IfDefine TOMCAT> +LoadModule jserv_module /usr/lib/apache/mod_jserv.so +</IfDefine> <IfDefine SSL> LoadModule ssl_module /usr/lib/apache/libssl.so </IfDefine> @@ -293,9 +296,12 @@ AddModule mod_example.c AddModule mod_unique_id.c AddModule mod_so.c AddModule mod_setenvif.c -#AddModule mod_php4.c -#AddModule mod_jserv.c -#AddModule mod_zmod.c +<IfDefine PHP4> +AddModule mod_php4.c +</IfDefine> +<IfDefine TOMCAT> +AddModule mod_jserv.c +</IfDefine> <IfDefine PERL> AddModule mod_perl.c </IfDefine> @@ -826,13 +832,17 @@ PerlSendHeader On # For example, the PHP 3.x module (not part of the Apache distribution - see # http://www.php.net) will typically use: # - #AddType application/x-httpd-php3 .php3 - #AddType application/x-httpd-php3-source .phps + <IfDefine PHP3> + AddType application/x-httpd-php3 .php3 + AddType application/x-httpd-php3-source .php3s + </IfDefine> # # And for PHP 4.x, use: # - #AddType application/x-httpd-php .php - #AddType application/x-httpd-php-source .phps + <IfDefine PHP4> + AddType application/x-httpd-php .php + AddType application/x-httpd-php-source .phps + </IfDefine> AddType application/x-tar .tgz @@ -1075,11 +1085,11 @@ SSLSessionCacheTimeout 300 # Semaphore: # Configure the path to the mutual explusion semaphore the -# SSL engine uses internally for inter-process synchronization. +# SSL engine uses internally for inter-process synchronization. SSLMutex file:/var/log/apache/ssl_mutex # Pseudo Random Number Generator (PRNG): -# Configure one or more sources to seed the PRNG of the +# Configure one or more sources to seed the PRNG of the # SSL library. The seed data should be of good random quality. # WARNING! On some platforms /dev/random blocks if not enough entropy # is available. This means you then cannot use the /dev/random device @@ -1258,7 +1268,7 @@ SSLCertificateKeyFile /etc/httpd/ssl.key/server.key # alert of the client. This is 100% SSL/TLS standard compliant, but in # practice often causes hanging connections with brain-dead browsers. Use # this only for browsers where you know that their SSL implementation -# works correctly. +# works correctly. # Notice: Most problems of broken clients are also related to the HTTP # keep-alive facility, so you usually additionally want to disable # keep-alive for those clients, too. Use variable "nokeepalive" for this. @@ -1274,4 +1284,7 @@ CustomLog /var/log/apache/ssl_request_log \ </IfDefine> +<IfDefine TOMCAT> #Include /etc/httpd/tomcat.conf +</IfDefine> + diff --git a/net-www/cocoon/cocoon-1.8.ebuild b/net-www/cocoon/cocoon-1.8.ebuild index 64ec1be9b389..d1ad4a94edca 100644 --- a/net-www/cocoon/cocoon-1.8.ebuild +++ b/net-www/cocoon/cocoon-1.8.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/cocoon/cocoon-1.8.ebuild,v 1.1 2000/11/26 22:48:36 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-1.8.ebuild,v 1.2 2001/01/05 07:58:48 achim Exp $ A=Cocoon-${PV}.tar.gz S=${WORKDIR}/${P} @@ -18,7 +18,7 @@ src_unpack() { unpack ${A} } -src_compile() { +src_compile() { CLASSPATH=/opt/java/src.jar:/opt/java/lib/tools.jar CLASSPATH=${CLASSPATH}:/usr/lib/java/jndi.jar CLASSPATH=${CLASSPATH}:/usr/lib/java/xt.jar:/usr/lib/java/sax.jar @@ -31,15 +31,17 @@ src_compile() { src_install() { cd ${S} - insinto /usr/lib/java + insinto /opt/tomcat/lib/cocoon for i in xerces_1_2 xalan_1_2_D02 fop_0_13_0 \ - servlet_2_2 stylebook-1.0-b2 turbine-pool + servlet_2_2 turbine-pool do doins lib/$i.jar done doins build/cocoon.jar - insinto /opt/tomcat/webapps/ROOT - doins ${O}/files/cocoon.properties + insinto /opt/tomcat/webapps/cocoon/WEB-INF + cp -a samples ${D}/opt/tomcat/webapps/cocoon + doins ${FILESDIR}/cocoon.properties + doins ${FILESDIR}/web.xml dodoc README LICENSE dodir /usr/doc/${PF}/html cp -a docs/* ${D}/usr/doc/${PF}/html @@ -47,5 +49,3 @@ src_install() { } - - diff --git a/net-www/cocoon/files/cocoon.properties b/net-www/cocoon/files/cocoon.properties index aa22517db9c7..3bb7f67e3fea 100644 --- a/net-www/cocoon/files/cocoon.properties +++ b/net-www/cocoon/files/cocoon.properties @@ -71,7 +71,6 @@ producer.parameter = producer # producer.type.xxx = full.class.name # where "xxx" is the producer indentier used in the request producer.type.file = org.apache.cocoon.producer.ProducerFromFile -producer.type.request = org.apache.cocoon.producer.ProducerFromRequest # This is used in the example files producer.type.dummy = org.apache.cocoon.example.DummyProducer @@ -106,6 +105,9 @@ processor.type.sql = org.apache.cocoon.processor.sql.SQLProcessor # in order for this processor to work. Check the FAQ for more information. #processor.type.ldap = org.apache.cocoon.processor.ldap.LdapProcessor +# XInclude Processor +processor.type.xinclude = org.apache.cocoon.processor.xinclude.XIncludeProcessor + ########################################## # XSP Processor # ########################################## @@ -117,19 +119,21 @@ processor.type.xsp = org.apache.cocoon.processor.xsp.XSPProcessor processor.xsp.languages = java # Default encoding to be used for code generation and compilation -# If omitted, the platform's default encoding will be used -# This encoding should be used in: -# - The XSP document <?xml?> declaration -# - The XSLT stylesheet <xsl:output> "encoding" attribute -# - Cocoon's default formatter "encoding" configuration property -### Example: Russian uses "Cp1251" -### processor.xsp.encoding = Cp1251 +# If omitted, the platform's default encoding will be used +# This encoding should also be used in: +# - The XSP document <?xml?> declaration +# - The "encoding" configuration property of the formatter to be used +# Example: Russian uses "Cp1251" +# processor.xsp.encoding = Cp1251 # support for the java language processor.xsp.java.processor = org.apache.cocoon.processor.xsp.language.java.XSPJavaProcessor +processor.xsp.java.processor.compiler = org.apache.cocoon.processor.xsp.language.java.SunJavaCompiler +#processor.xsp.java.processor.compiler = org.apache.cocoon.processor.xsp.language.java.JikesJavaCompiler processor.xsp.java.logicsheet = xsp-java.xsl processor.xsp.java.preprocessor = org.apache.cocoon.processor.xsp.language.java.XSPJavaPreprocessor + # sets the repository where the compiled pages are stored. # NOTE: make sure the directory is readable. This directory is usually # relative to the web server's or to the servlet engine's. In case you're not @@ -152,7 +156,36 @@ processor.xsp.logicsheet.request.java = resource://org/apache/cocoon/processor/ processor.xsp.logicsheet.response.java = resource://org/apache/cocoon/processor/xsp/library/java/response.xsl processor.xsp.logicsheet.session.java = resource://org/apache/cocoon/processor/xsp/library/java/session.xsl processor.xsp.logicsheet.util.java = resource://org/apache/cocoon/processor/xsp/library/java/util.xsl -processor.xsp.logicsheet.sql.java = resource://org/apache/cocoon/processor/xsp/library/java/sql.xsl +processor.xsp.logicsheet.sql.java = resource://org/apache/cocoon/processor/xsp/library/sql/sql.xsl +processor.xsp.logicsheet.fp.java = resource://org/apache/cocoon/processor/xsp/library/fp/fp.xsl + +# Turbine DB Connection Pool +############################ + +# These are your database settings, look in the +# org.apache.turbine.util.db.pool.* package for more information. +processor.xsp.pool.database.default.driver=oracle.jdbc.driver.OracleDriver +processor.xsp.pool.database.default.url=jdbc:oracle:thin:@localhost:1521:ORCL +processor.xsp.pool.database.default.username=dbUser +processor.xsp.pool.database.default.password=dbPass +processor.xsp.pool.database.default.maxConnections=3 +processor.xsp.pool.database.default.expiryTime=3600000 + +# These are the supported jdbc-drivers and their adaptors. +# These properties are used by the DBFactory. +processor.xsp.pool.database.adaptor=DBWeblogic,DBOracle,DBInstantDB,DBPostgres,DBSybase,DBInformix +processor.xsp.pool.database.adaptor.DBWeblogic=weblogic.jdbc.pool.Driver +processor.xsp.pool.database.adaptor.DBOracle=oracle.jdbc.driver.OracleDriver +processor.xsp.pool.database.adaptor.DBInstantDB=org.enhydra.instantdb.jdbc.idbDriver +processor.xsp.pool.database.adaptor.DBPostgres=postgresql.Driver +processor.xsp.pool.database.adaptor.DBInformix=com.informix.jdbc.IfxDriver +processor.xsp.pool.database.adaptor.DBSybase=com.sybase.jdbc.SybDriver + +# The full path name to a pool log file +# if not given, commands to log events using org.apache.turbine.util.Log will be ignored. +# This file must already exist and be writable. +# Default: none +#processor.xsp.pool.logfile=/opt/apache/var/log/dbPool.log #### !!!!WARNING!!!! ########### @@ -245,9 +278,9 @@ formatter.application/smil.doctype-system = http://www.w3.org/TR/REC-smil/SMIL10 formatter.application/smil.MIME-type = application/smil # SVG (20000303 WD) -formatter.image/svg.doctype-public = -//W3C//DTD SVG 20000303 Stylable//EN -formatter.image/svg.doctype-system = http://www.w3.org/TR/2000/03/WD-SVG-20000303/ -formatter.image/svg.MIME-type = image/svg-xml +formatter.image/svg-xml.doctype-public = -//W3C//DTD SVG 20000303 Stylable//EN +formatter.image/svg-xml.doctype-system = http://www.w3.org/TR/2000/03/WD-SVG-20000303/ +formatter.image/svg-xml.MIME-type = image/svg-xml @@ -285,7 +318,7 @@ store.heapsize = 60000000 # Indicates the thread priority (1-10: 10 is maximum, 1 is minimum) #store.threadpriority = 10 -# Uncomment this to disable the background thread that manages the cache +# Uncomment this to disable the background thread that manages the cache # overflow and leave this at request time. #store.usethread = false @@ -334,3 +367,15 @@ browser.11 = mozilla5=Mozilla/5 browser.12 = mozilla5=Netscape6/ browser.13 = netscape=Mozilla +########################################## +# Profiling # +########################################## + +#Uncomment this to enable coarse performance profiling. +#Look at samples/profiler/profiler.xml to see the results of the profiler + +#profiler.enabled=true + +#Comment this out to remove the <--this page was served ... comment from the +#end of text pages served by Cocoon +verbosity=true diff --git a/net-www/jakarta/files/jakarta b/net-www/jakarta/files/jakarta index bad66ad99fe0..f8d852ca2af0 100755 --- a/net-www/jakarta/files/jakarta +++ b/net-www/jakarta/files/jakarta @@ -1,6 +1,6 @@ #!/bin/sh #RCUPDATE:3 4:75: -# $Id: jakarta,v 1.3 2000/11/02 08:31:53 achim Exp $ +# $Id: jakarta,v 1.4 2001/01/05 07:58:48 achim Exp $ . /etc/rc.d/config/functions @@ -47,26 +47,22 @@ oldCP=$CLASSPATH CLASSPATH=. - -for i in ${TOMCAT_HOME}/lib/* ; do - CLASSPATH=${CLASSPATH}:$i -done - -if [ -f /usr/lib/java/tomcat.jar ]; then - CLASSPATH=/usr/lib/java/tomcat.jar:${CLASSPATH} -fi - # Add support for Cocoon if available -if [ -f /usr/lib/java/cocoon.jar ]; then - CLASSPATH=/usr/lib/java/cocoon.jar:${CLASSPATH} - CLASSPATH=/usr/lib/java/fop_0_12_1.jar:${CLASSPATH} - CLASSPATH=/usr/lib/java/xalan_1_0_1.jar:${CLASSPATH} - CLASSPATH=/usr/lib/java/xerces_1_0_3.jar:${CLASSPATH} +if [ -f /opt/tomcat/lib/cocoon/cocoon.jar ]; then + + for i in ${TOMCAT_HOME}/lib/cocoon/*.jar + do + CLASSPATH=${i}:${CLASSPATH} + done CLASSPATH=${CLASSPATH}:/usr/lib/java/jndi.jar fi -CLASSPATH=${CLASSPATH}:/opt/java/src.jar:/opt/java/lib +for i in ${TOMCAT_HOME}/lib/* ; do + CLASSPATH=${CLASSPATH}:$i +done + +CLASSPATH=${CLASSPATH}:/opt/java/src.jar:/opt/java/lib/tools.jar export CLASSPATH diff --git a/net-www/jakarta/files/tomcat.conf b/net-www/jakarta/files/tomcat.conf index d8f6645fb1d2..cfa38e63e43f 100644 --- a/net-www/jakarta/files/tomcat.conf +++ b/net-www/jakarta/files/tomcat.conf @@ -4,16 +4,13 @@ # Note: this file should be appended or included into your httpd.conf -# Tell Apache on win32 to load the Apache JServ communication module -# LoadModule jserv_module modules/ApacheModuleJServ.dll - # 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! +# Do not edit! ApJServManual on ApJServDefaultProtocol ajpv12 ApJServSecretKey DISABLED @@ -46,5 +43,20 @@ ApJServMount /examples /root # 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/files/web.xml b/net-www/jakarta/files/web.xml index dbd9ad4c91f7..a777a067062a 100644 --- a/net-www/jakarta/files/web.xml +++ b/net-www/jakarta/files/web.xml @@ -48,34 +48,6 @@ -2147483646 </load-on-startup> </servlet> - -<!-- uncoomet the following to use Cocoon - <servlet> - <servlet-name> - org.apache.cocoon.Cocoon - </servlet-name> - <servlet-class> - org.apache.cocoon.Cocoon - </servlet-class> - <init-param> - <param-name> - properties - </param-name> - <param-value> - cocoon.properties - </param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name> - org.apache.cocoon.Cocoon - </servlet-name> - <url-pattern> - *.xml - </url-pattern> - </servlet-mapping> - ---> <servlet-mapping> <servlet-name> invoker @@ -157,619 +129,619 @@ <extension> java </extension> - <mime-type>
- text/plain
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- body
- </extension>
- <mime-type>
- text/html
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- rtx
- </extension>
- <mime-type>
- text/richtext
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tsv
- </extension>
- <mime-type>
- text/tab-separated-values
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- etx
- </extension>
- <mime-type>
- text/x-setext
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ps
- </extension>
- <mime-type>
- application/x-postscript
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- class
- </extension>
- <mime-type>
- application/java
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- csh
- </extension>
- <mime-type>
- application/x-csh
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- sh
- </extension>
- <mime-type>
- application/x-sh
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tcl
- </extension>
- <mime-type>
- application/x-tcl
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tex
- </extension>
- <mime-type>
- application/x-tex
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- texinfo
- </extension>
- <mime-type>
- application/x-texinfo
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- texi
- </extension>
- <mime-type>
- application/x-texinfo
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- t
- </extension>
- <mime-type>
- application/x-troff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tr
- </extension>
- <mime-type>
- application/x-troff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- roff
- </extension>
- <mime-type>
- application/x-troff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- man
- </extension>
- <mime-type>
- application/x-troff-man
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- me
- </extension>
- <mime-type>
- application/x-troff-me
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ms
- </extension>
- <mime-type>
- application/x-wais-source
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- src
- </extension>
- <mime-type>
- application/x-wais-source
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- zip
- </extension>
- <mime-type>
- application/zip
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- bcpio
- </extension>
- <mime-type>
- application/x-bcpio
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- cpio
- </extension>
- <mime-type>
- application/x-cpio
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- gtar
- </extension>
- <mime-type>
- application/x-gtar
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- shar
- </extension>
- <mime-type>
- application/x-shar
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- sv4cpio
- </extension>
- <mime-type>
- application/x-sv4cpio
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- sv4crc
- </extension>
- <mime-type>
- application/x-sv4crc
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tar
- </extension>
- <mime-type>
- application/x-tar
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ustar
- </extension>
- <mime-type>
- application/x-ustar
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- dvi
- </extension>
- <mime-type>
- application/x-dvi
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- hdf
- </extension>
- <mime-type>
- application/x-hdf
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- latex
- </extension>
- <mime-type>
- application/x-latex
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- bin
- </extension>
- <mime-type>
- application/octet-stream
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- oda
- </extension>
- <mime-type>
- application/oda
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- pdf
- </extension>
- <mime-type>
- application/pdf
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ps
- </extension>
- <mime-type>
- application/postscript
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- eps
- </extension>
- <mime-type>
- application/postscript
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ai
- </extension>
- <mime-type>
- application/postscript
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- rtf
- </extension>
- <mime-type>
- application/rtf
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- nc
- </extension>
- <mime-type>
- application/x-netcdf
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- cdf
- </extension>
- <mime-type>
- application/x-netcdf
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- cer
- </extension>
- <mime-type>
- application/x-x509-ca-cert
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- exe
- </extension>
- <mime-type>
- application/octet-stream
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- gz
- </extension>
- <mime-type>
- application/x-gzip
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- Z
- </extension>
- <mime-type>
- application/x-compress
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- z
- </extension>
- <mime-type>
- application/x-compress
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- hqx
- </extension>
- <mime-type>
- application/mac-binhex40
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mif
- </extension>
- <mime-type>
- application/x-mif
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ief
- </extension>
- <mime-type>
- image/ief
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tiff
- </extension>
- <mime-type>
- image/tiff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- tif
- </extension>
- <mime-type>
- image/tiff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ras
- </extension>
- <mime-type>
- image/x-cmu-raster
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- pnm
- </extension>
- <mime-type>
- image/x-portable-anymap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- pbm
- </extension>
- <mime-type>
- image/x-portable-bitmap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- pgm
- </extension>
- <mime-type>
- image/x-portable-graymap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- ppm
- </extension>
- <mime-type>
- image/x-portable-pixmap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- rgb
- </extension>
- <mime-type>
- image/x-rgb
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- xbm
- </extension>
- <mime-type>
- image/x-xbitmap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- xpm
- </extension>
- <mime-type>
- image/x-xpixmap
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- xwd
- </extension>
- <mime-type>
- image/x-xwindowdump
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- au
- </extension>
- <mime-type>
- audio/basic
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- snd
- </extension>
- <mime-type>
- audio/basic
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- aif
- </extension>
- <mime-type>
- audio/x-aiff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- aiff
- </extension>
- <mime-type>
- audio/x-aiff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- aifc
- </extension>
- <mime-type>
- audio/x-aiff
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- wav
- </extension>
- <mime-type>
- audio/x-wav
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mpeg
- </extension>
- <mime-type>
- video/mpeg
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mpg
- </extension>
- <mime-type>
- video/mpeg
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mpe
- </extension>
- <mime-type>
- video/mpeg
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- qt
- </extension>
- <mime-type>
- video/quicktime
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mov
- </extension>
- <mime-type>
- video/quicktime
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- avi
- </extension>
- <mime-type>
- video/x-msvideo
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- movie
- </extension>
- <mime-type>
- video/x-sgi-movie
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- avx
- </extension>
- <mime-type>
- video/x-rad-screenplay
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- wrl
- </extension>
- <mime-type>
- x-world/x-vrml
- </mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>
- mpv2
- </extension>
- <mime-type>
- video/mpeg2
- </mime-type>
- </mime-mapping>
- <welcome-file-list>
- <welcome-file>
- index.jsp
- </welcome-file>
- <welcome-file>
- index.html
- </welcome-file>
- <welcome-file>
- index.htm
- </welcome-file>
- </welcome-file-list>
-</web-app>
+ <mime-type> + text/plain + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + body + </extension> + <mime-type> + text/html + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + rtx + </extension> + <mime-type> + text/richtext + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tsv + </extension> + <mime-type> + text/tab-separated-values + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + etx + </extension> + <mime-type> + text/x-setext + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ps + </extension> + <mime-type> + application/x-postscript + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + class + </extension> + <mime-type> + application/java + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + csh + </extension> + <mime-type> + application/x-csh + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + sh + </extension> + <mime-type> + application/x-sh + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tcl + </extension> + <mime-type> + application/x-tcl + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tex + </extension> + <mime-type> + application/x-tex + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + texinfo + </extension> + <mime-type> + application/x-texinfo + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + texi + </extension> + <mime-type> + application/x-texinfo + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + t + </extension> + <mime-type> + application/x-troff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tr + </extension> + <mime-type> + application/x-troff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + roff + </extension> + <mime-type> + application/x-troff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + man + </extension> + <mime-type> + application/x-troff-man + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + me + </extension> + <mime-type> + application/x-troff-me + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ms + </extension> + <mime-type> + application/x-wais-source + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + src + </extension> + <mime-type> + application/x-wais-source + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + zip + </extension> + <mime-type> + application/zip + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + bcpio + </extension> + <mime-type> + application/x-bcpio + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + cpio + </extension> + <mime-type> + application/x-cpio + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + gtar + </extension> + <mime-type> + application/x-gtar + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + shar + </extension> + <mime-type> + application/x-shar + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + sv4cpio + </extension> + <mime-type> + application/x-sv4cpio + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + sv4crc + </extension> + <mime-type> + application/x-sv4crc + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tar + </extension> + <mime-type> + application/x-tar + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ustar + </extension> + <mime-type> + application/x-ustar + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + dvi + </extension> + <mime-type> + application/x-dvi + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + hdf + </extension> + <mime-type> + application/x-hdf + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + latex + </extension> + <mime-type> + application/x-latex + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + bin + </extension> + <mime-type> + application/octet-stream + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + oda + </extension> + <mime-type> + application/oda + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + pdf + </extension> + <mime-type> + application/pdf + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ps + </extension> + <mime-type> + application/postscript + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + eps + </extension> + <mime-type> + application/postscript + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ai + </extension> + <mime-type> + application/postscript + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + rtf + </extension> + <mime-type> + application/rtf + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + nc + </extension> + <mime-type> + application/x-netcdf + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + cdf + </extension> + <mime-type> + application/x-netcdf + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + cer + </extension> + <mime-type> + application/x-x509-ca-cert + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + exe + </extension> + <mime-type> + application/octet-stream + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + gz + </extension> + <mime-type> + application/x-gzip + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + Z + </extension> + <mime-type> + application/x-compress + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + z + </extension> + <mime-type> + application/x-compress + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + hqx + </extension> + <mime-type> + application/mac-binhex40 + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mif + </extension> + <mime-type> + application/x-mif + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ief + </extension> + <mime-type> + image/ief + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tiff + </extension> + <mime-type> + image/tiff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + tif + </extension> + <mime-type> + image/tiff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ras + </extension> + <mime-type> + image/x-cmu-raster + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + pnm + </extension> + <mime-type> + image/x-portable-anymap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + pbm + </extension> + <mime-type> + image/x-portable-bitmap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + pgm + </extension> + <mime-type> + image/x-portable-graymap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + ppm + </extension> + <mime-type> + image/x-portable-pixmap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + rgb + </extension> + <mime-type> + image/x-rgb + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + xbm + </extension> + <mime-type> + image/x-xbitmap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + xpm + </extension> + <mime-type> + image/x-xpixmap + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + xwd + </extension> + <mime-type> + image/x-xwindowdump + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + au + </extension> + <mime-type> + audio/basic + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + snd + </extension> + <mime-type> + audio/basic + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + aif + </extension> + <mime-type> + audio/x-aiff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + aiff + </extension> + <mime-type> + audio/x-aiff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + aifc + </extension> + <mime-type> + audio/x-aiff + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + wav + </extension> + <mime-type> + audio/x-wav + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mpeg + </extension> + <mime-type> + video/mpeg + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mpg + </extension> + <mime-type> + video/mpeg + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mpe + </extension> + <mime-type> + video/mpeg + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + qt + </extension> + <mime-type> + video/quicktime + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mov + </extension> + <mime-type> + video/quicktime + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + avi + </extension> + <mime-type> + video/x-msvideo + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + movie + </extension> + <mime-type> + video/x-sgi-movie + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + avx + </extension> + <mime-type> + video/x-rad-screenplay + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + wrl + </extension> + <mime-type> + x-world/x-vrml + </mime-type> + </mime-mapping> + <mime-mapping> + <extension> + mpv2 + </extension> + <mime-type> + video/mpeg2 + </mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file> + index.jsp + </welcome-file> + <welcome-file> + index.html + </welcome-file> + <welcome-file> + index.htm + </welcome-file> + </welcome-file-list> +</web-app> diff --git a/net-www/jakarta/jakarta-3.1-r1.ebuild b/net-www/jakarta/jakarta-3.1-r1.ebuild index 4629b58d3e87..90905dd64884 100644 --- a/net-www/jakarta/jakarta-3.1-r1.ebuild +++ b/net-www/jakarta/jakarta-3.1-r1.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-r1.ebuild,v 1.5 2001/01/05 03:21:55 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r1.ebuild,v 1.6 2001/01/05 07:58:48 achim Exp $ P=jakarta-3.1 A="jakarta-tomcat.tar.gz jakarta-ant.tar.gz" @@ -37,10 +37,9 @@ src_compile() { rm -rf org } -src_install() { - dodir /opt/jakarta +src_install() { cp -a ${S}/build/tomcat ${D}/opt - insinto /usr/lib/java + insinto /opt/tomcat/lib doins ${S}/build/tomcat/classes/tomcat.jar rm -rf ${D}/opt/tomcat/classes insinto /usr/lib/apache @@ -50,8 +49,8 @@ src_install() { insinto /etc/rc.d/init.d insopts -m755 doins ${O}/files/jakarta - insinto /opt/tomcat/conf - doins ${O}/files/web.xml + #insinto /opt/tomcat/conf + #doins ${O}/files/web.xml cd ${S}/jakarta-tomcat dodoc BUGS LICENSE README RELEASE-* TODO etc/*.txt src/doc/faq src/doc/readme @@ -69,13 +68,6 @@ src_install() { pkg_config() { - source ${ROOT}/etc/rc.d/config/functions - einfo "Activating mod_jserv in httpd.conf..." - cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig - sed -e "s:^#LoadModule jserv_module:LoadModule jserv_module:" \ - -e "s:^#AddModule mod_jserv\.c:AddModule mod_jserv\.c:" \ - -e "s:^#Include /etc/httpd/tomcat\.conf:Include /etc/httpd/tomcat\.conf:" \ - ${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf einfo "Activating Servlet Engine..." ${ROOT}/usr/sbin/rc-update add jakarta } |