CVS libapache-mod-jk/debian

Wolfgang B??r wbaer-guest@haydn.debian.org
Wed Jun 29 20:11:02 2005


Update of /cvsroot/pkg-java/libapache-mod-jk/debian
In directory haydn:/tmp/cvs-serv4635/debian

Modified Files:
	changelog control copyright libapache-mod-jk.docs rules 
	workers.properties 
Added Files:
	NEWS httpd_example_apache.conf httpd_example_apache2.conf 
	jk.load libapache-mod-jk-doc.docs 
	libapache-mod-jk-doc.examples libapache-mod-jk.README.Debian 
	libapache-mod-jk.dirs libapache2-mod-jk.README.Debian 
	libapache2-mod-jk.dirs libapache2-mod-jk.docs 
	libapache2-mod-jk.install libapache2-mod-jk.postinst 
	libapache2-mod-jk.prerm 
Removed Files:
	httpd.conf libapache-mod-jk.examples 
Log Message:
preparing 1.2.13-1 release


--- /cvsroot/pkg-java/libapache-mod-jk/debian/changelog	2004/01/30 16:36:49	1.2
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/changelog	2005/06/29 20:10:05	1.3
@@ -1,3 +1,21 @@
+libapache-mod-jk (1:1.2.13-1) unstable; urgency=low
+
+  * New upstream release (closes: #307331)
+  * Removed cdbs dependency - building only with debhelper
+  * Build Apache2 package (closes: #296345)
+    + debian/control: package libapache2-mod-jk added
+    + debian/control: added apache2-threaded-dev build dependency
+  * Split documentation in own package so it does not ship twice
+    + debian/control: package libapache-mod-jk-doc added
+    + debian/control: xsltproc dependency for building
+  * Updated workers.properties
+  * Added example httpd.conf files for Apache 1.3 and 2
+  * Added coming tomcat5 as alternative to tomcat4 to suggests
+  * Updated copyright to new upstream Apache License Version 2.0
+  * Updated Standards-Version to 3.6.2 - no changes
+
+ -- Wolfgang Baer <WBaer@gmx.de>  Thu, 23 Jun 2005 22:42:54 +0200
+
 libapache-mod-jk (1:1.2.5-2) unstable; urgency=low
 
   * Added libtool build dependency (closes: #229395)
--- /cvsroot/pkg-java/libapache-mod-jk/debian/control	2004/01/30 16:36:49	1.2
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/control	2005/06/29 20:10:05	1.3
@@ -2,23 +2,52 @@
 Section: web
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas@debian.org>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), apache-dev (>= 1.3.29.0.1), libtool
-Standards-Version: 3.6.1
+Uploaders: Stefan Gybas <sgybas@debian.org>, Wolfgang Baer <WBaer@gmx.de>
+Build-Depends: debhelper (>= 4.1.0), dpatch, apache-dev (>= 1.3.29.0.1), apache2-threaded-dev, libtool
+Build-Depends-Indep: xsltproc
+Standards-Version: 3.6.2
 
 Package: libapache-mod-jk
 Architecture: any
 Section: web
 Priority: optional
 Depends: ${shlibs:Depends}, apache-common (>= 1.3.29.0.1), apache | apache-perl | apache-ssl
-Suggests: tomcat4
+Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc
 Description: Apache 1.3 connector for the Tomcat Java servlet engine
  Apache Tomcat is the reference implementation for the Java Servlet and
  JavaServer Pages (JSP) specification from the Apache Jakarta project.
  .
  This package contains an Apache 1.3 module (mod_jk) to forward requests
- from Apache to Tomcat using the AJP 1.2, 1.3 or 1.4 protocol. It can either
+ from Apache to Tomcat using the AJP 1.3 or 1.4 protocol. It can either
  talk to Tomcat on the local machine or to a remote engine using TCP.
  .
  For more information about Tomcat please take a look at the home page at
  http://jakarta.apache.org/tomcat/index.html.
+
+Package: libapache2-mod-jk
+Architecture: any
+Section: web
+Priority: optional
+Depends: ${shlibs:Depends}, apache2-common, apache2
+Suggests: tomcat4 | tomcat5, libapache-mod-jk-doc
+Description: Apache 2 connector for the Tomcat Java servlet engine
+ Apache Tomcat is the reference implementation for the Java Servlet and
+ JavaServer Pages (JSP) specification from the Apache Jakarta project.
+ .
+ This package contains an Apache 2 module (mod_jk) to forward requests
+ from Apache to Tomcat using the AJP 1.3 or 1.4 protocol. It can either
+ talk to Tomcat on the local machine or to a remote engine using TCP.
+ .
+ For more information about Tomcat please take a look at the home page at
+ http://jakarta.apache.org/tomcat/index.html.
+
+Package: libapache-mod-jk-doc
+Architecture: all
+Section: doc
+Priority: optional
+Description: Documentation and examples of libapache-mod-jk packages
+ Documentation and examples of the Apache jk connector for the Tomcat 
+ Java servlet engine
+ .
+ For uptodate documentation about Tomcat connectors please take a look
+ at the home page at http://jakarta.apache.org/tomcat/connectors-doc.
--- /cvsroot/pkg-java/libapache-mod-jk/debian/copyright	2004/01/10 17:55:40	1.1
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/copyright	2005/06/29 20:10:05	1.2
@@ -6,61 +6,178 @@
 
 Copyright:
 
-/* ========================================================================= *
- *                                                                           *
- *                 The Apache Software License,  Version 1.1                 *
- *                                                                           *
- *      Copyright (c) 1999, 2000, 2001  The Apache Software Foundation.      *
- *                           All rights reserved.                            *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * Redistribution and use in source and binary forms,  with or without modi- *
- * fication, are permitted provided that the following conditions are met:   *
- *                                                                           *
- * 1. Redistributions of source code  must retain the above copyright notice *
- *    notice, this list of conditions and the following disclaimer.          *
- *                                                                           *
- * 2. Redistributions  in binary  form  must  reproduce the  above copyright *
- *    notice,  this list of conditions  and the following  disclaimer in the *
- *    documentation and/or other materials provided with the distribution.   *
- *                                                                           *
- * 3. The end-user documentation  included with the redistribution,  if any, *
- *    must include the following acknowlegement:                             *
- *                                                                           *
- *       "This product includes  software developed  by the Apache  Software *
- *        Foundation <http://www.apache.org/>."                              *
- *                                                                           *
- *    Alternately, this acknowlegement may appear in the software itself, if *
- *    and wherever such third-party acknowlegements normally appear.         *
- *                                                                           *
- * 4. The names  "The  Jakarta  Project",  "Tomcat",  and  "Apache  Software *
- *    Foundation"  must not be used  to endorse or promote  products derived *
- *    from this  software without  prior  written  permission.  For  written *
- *    permission, please contact <apache@apache.org>.                        *
- *                                                                           *
- * 5. Products derived from this software may not be called "Apache" nor may *
- *    "Apache" appear in their names without prior written permission of the *
- *    Apache Software Foundation.                                            *
- *                                                                           *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
- * INCLUDING, BUT NOT LIMITED TO,  THE IMPLIED WARRANTIES OF MERCHANTABILITY *
- * AND FITNESS FOR  A PARTICULAR PURPOSE  ARE DISCLAIMED.  IN NO EVENT SHALL *
- * THE APACHE  SOFTWARE  FOUNDATION OR  ITS CONTRIBUTORS  BE LIABLE  FOR ANY *
- * DIRECT,  INDIRECT,   INCIDENTAL,  SPECIAL,  EXEMPLARY,  OR  CONSEQUENTIAL *
- * DAMAGES (INCLUDING,  BUT NOT LIMITED TO,  PROCUREMENT OF SUBSTITUTE GOODS *
- * OR SERVICES;  LOSS OF USE,  DATA,  OR PROFITS;  OR BUSINESS INTERRUPTION) *
- * HOWEVER CAUSED AND  ON ANY  THEORY  OF  LIABILITY,  WHETHER IN  CONTRACT, *
- * STRICT LIABILITY, OR TORT  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
- * ANY  WAY  OUT OF  THE  USE OF  THIS  SOFTWARE,  EVEN  IF  ADVISED  OF THE *
- * POSSIBILITY OF SUCH DAMAGE.                                               *
- *                                                                           *
- * ========================================================================= *
- *                                                                           *
- * This software  consists of voluntary  contributions made  by many indivi- *
- * duals on behalf of the  Apache Software Foundation.  For more information *
- * on the Apache Software Foundation, please see <http://www.apache.org/>.   *
- *                                                                           *
- * ========================================================================= */
- */
 
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
--- /cvsroot/pkg-java/libapache-mod-jk/debian/libapache-mod-jk.docs	2004/01/10 17:55:40	1.1
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/libapache-mod-jk.docs	2005/06/29 20:10:05	1.2
@@ -1,7 +1 @@
-jk/docs/*.html
-jk/docs/style.css
-jk/docs/common
-jk/docs/images
-jk/docs/jk
-jk/docs/jk2
-
+debian/httpd_example_apache.conf
--- /cvsroot/pkg-java/libapache-mod-jk/debian/rules	2004/01/10 17:55:40	1.1
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/rules	2005/06/29 20:10:05	1.2
@@ -1,19 +1,61 @@
 #!/usr/bin/make -f
-# debian/rules file for libapache-mod-jk (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-# We can't use the autotools class since jk/native/configure does not work
-# with all the options that the autotools class specifies. But we use
-# the autotools-files class to update config.sub and config.guess.
-_cdbs_class_makefile := 1
-include /usr/share/cdbs/1/class/autotools-files.mk
-DEB_AC_AUX_DIR := jk/native/scripts/build/unix
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_DH_MAKESHLIBS_ARGS_libapache-mod-jk := --noscripts
+CFLAGS = -Wall -g
 
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
 
-clean::
+build: patch build-stamp
+
+build-stamp:  
+	dh_testdir
+	touch build-stamp
+
+build-apache13:
+	dh_testdir
+	-$(MAKE) -C jk/native clean 
+	cd jk/native && ./configure --with-apxs=/usr/bin/apxs
+	make -C jk/native
+
+build-apache20:
+	dh_testdir
+	-$(MAKE) -C jk/native clean 
+	cd jk/native && ./configure --with-apxs=/usr/bin/apxs2
+	make -C jk/native
+
+build-doc:
+	cd jk/xdocs && install -d ../build/docs/ && cp -R * ../build/docs/
+	cd jk/build/docs && for i in `find . -name '*.xml'`; do xsltproc style.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done
+	cd jk/build/docs && find . -name '*.xml' -exec rm -f {} \;
+	cd jk/build/docs && rm -f style.xsl
+	
+
+## -------- INSTALL TARGETS
+apache13: build-apache13
+	mkdir -p $(CURDIR)/debian/libapache-mod-jk/usr/lib/apache/1.3/
+	cp jk/native/apache-1.3/mod_jk.so.0.0.0 debian/libapache-mod-jk/usr/lib/apache/1.3/mod_jk.so
+
+apache20: build-apache20
+	mkdir -p $(CURDIR)/debian/libapache2-mod-jk/usr/lib/apache2/modules/
+	cp jk/native/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so
+
+## -------- CLEAN TARGETS
+clean: clean-patched unpatch
+clean-patched:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+	rm -f jk/native/common/portable.h jk/native/common/stamp-h1	
+	rm -rf jk/build
 	rm -f jk/native/apache-1.3/Makefile jk/native/apache-1.3/Makefile.apxs
 	rm -f jk/native/apache-2.0/Makefile jk/native/apache-2.0/Makefile.apxs
 	rm -f jk/native/common/Makefile jk/native/common/list.mk
@@ -22,17 +64,61 @@
 	rm -f jk/native/apache-1.3/mod_jk.o
 	rm -f jk/native/apache-1.3/mod_jk.la jk/native/apache-1.3/mod_jk.lo
 	rm -f jk/native/apache-1.3/mod_jk.a jk/native/apache-1.3/mod_jk.so*
+	rm -f jk/native/apache-2.0/mod_jk.o
+	rm -f jk/native/apache-2.0/mod_jk.la jk/native/apache-2.0/mod_jk.lo
+	rm -f jk/native/apache-2.0/mod_jk.a jk/native/apache-2.0/mod_jk.so*
 	rm -f jk/native/common/*.lo jk/native/common/*.o
 	rm -rf jk/native/apache-1.3/.libs jk/native/common/.libs
+	rm -rf jk/native/apache-2.0/.libs jk/native/common/.libs
+	dh_clean -k
 
-configure/libapache-mod-jk:: jk/native/config.status
-jk/native/config.status:
-	cd jk/native && ./configure --with-apxs=/usr/bin/apxs
-
-build/libapache-mod-jk::
-	make -C jk/native
-
-install/libapache-mod-jk::
-	mkdir -p debian/libapache-mod-jk/usr/lib/apache/1.3/
-	cp jk/native/apache-1.3/mod_jk.so.0.0.0 debian/libapache-mod-jk/usr/lib/apache/1.3/mod_jk.so
+## -------- INSTALL TARGETS
 
+install: install-stamp
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	dh_install
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	touch patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+	
+# Build architecture-independent files here.
+binary-indep: build build-doc install	
+	dh_testdir -i 
+	dh_testroot -i
+	dh_installexamples -i
+	dh_installdocs -i
+	dh_compress -i -Xchangelog.html
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: apache13 apache20 install
+	dh_testdir -a 
+	dh_testroot -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+													
+binary: binary-indep binary-arch
+.PHONY: binary-indep build-doc binary-arch build-apache13 build-apache20 binary install
--- /cvsroot/pkg-java/libapache-mod-jk/debian/workers.properties	2004/01/10 17:55:40	1.1
+++ /cvsroot/pkg-java/libapache-mod-jk/debian/workers.properties	2005/06/29 20:10:05	1.2
@@ -1,13 +1,102 @@
-# Tomcat and Java configuration
+# workers.properties -
+#
+# This file is a simplified version of the workers.properties supplied
+# with the upstream sources. The jni inprocess worker (not build in the
+# debian package) section and the ajp12 (deprecated) section are removed.
+#
+# As a general note, the characters $( and ) are used internally to define
+# macros. Do not use them in your own configuration!!!
+#
+# Whenever you see a set of lines such as:
+# x=value
+# y=$(x)\something
+#
+# the final value for y will be value\something
+#
+# Normaly all you will need to do is un-comment and modify the first three
+# properties, i.e. workers.tomcat_home, workers.java_home and ps.
+# Most of the configuration is derived from these.
+#
+# When you are done updating workers.tomcat_home, workers.java_home and ps
+# you should have 3 workers configured:
+#
+# - An ajp13 worker that connects to localhost:8009
+# - A load balancer worker
+#
+#
+
+# OPTIONS ( very important for jni mode ) 
+
+#
+# workers.tomcat_home should point to the location where you
+# installed tomcat. This is where you have your conf, webapps and lib
+# directories.
 #
 workers.tomcat_home=/usr/share/tomcat4
-workers.java_home=/usr/lib/j2se/1.4
+
+#
+# workers.java_home should point to your Java installation. Normally
+# you should have a bin and lib directories beneath it.
+#
+workers.java_home=/usr/lib/j2sdk1.4-sun
+
+#
+# You should configure your environment slash... ps=\ on NT and / on UNIX
+# and maybe something different elsewhere.
+#
 ps=/
-worker.list=local
 
-# Definition for local worker using AJP 1.3
 #
-worker.local.type=ajp13
-worker.local.host=localhost
-worker.local.port=8009
+#------ ADVANCED MODE ------------------------------------------------
+#---------------------------------------------------------------------
+#
+
+#
+#------ worker list ------------------------------------------
+#---------------------------------------------------------------------
+#
+#
+# The workers that your plugins should create and work with
+# 
+worker.list=ajp13_worker
+
+#
+#------ ajp13_worker WORKER DEFINITION ------------------------------
+#---------------------------------------------------------------------
+#
+
+#
+# Defining a worker named ajp13_worker and of type ajp13
+# Note that the name and the type do not have to match.
+#
+worker.ajp13_worker.port=8009
+worker.ajp13_worker.host=localhost
+worker.ajp13_worker.type=ajp13
+#
+# Specifies the load balance factor when used with
+# a load balancing worker.
+# Note:
+#  ----> lbfactor must be > 0
+#  ----> Low lbfactor means less work done by the worker.
+worker.ajp13_worker.lbfactor=1
+
+#
+# Specify the size of the open connection cache.
+#worker.ajp13_worker.cachesize
+
+#
+#------ DEFAULT LOAD BALANCER WORKER DEFINITION ----------------------
+#---------------------------------------------------------------------
+#
+
+#
+# The loadbalancer (type lb) workers perform wighted round-robin
+# load balancing with sticky sessions.
+# Note:
+#  ----> If a worker dies, the load balancer will check its state
+#        once in a while. Until then all work is redirected to peer
+#        workers.
+worker.loadbalancer.type=lb
+worker.loadbalancer.balanced_workers=ajp13_worker
+