Author: ranger
Date: Fri Jun 30 04:58:35 2006
New Revision: 158
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=158&repname=user%3a+ranger>
Log:
tyrex update, tomcat 4 and 5
Modified:
trunk/experimental/common/main/finkinfo/libs/tyrex.info
trunk/experimental/common/main/finkinfo/web/tomcat4.info
trunk/experimental/common/main/finkinfo/web/tomcat4.patch
trunk/experimental/common/main/finkinfo/web/tomcat5.info
trunk/experimental/common/main/finkinfo/web/tomcat5.patch
Modified: trunk/experimental/common/main/finkinfo/libs/tyrex.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/tyrex.info&rev=158&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/tyrex.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/tyrex.info Fri Jun 30 04:58:35
2006
@@ -1,19 +1,20 @@
Package: tyrex
-Version: 1.0.1
+Version: 1.0.3
Revision: 1
-Depends: jta-spec (>= 1.0.1-2), jca (>= 1.0-2), jaas (>= 1.0-1), log4j (>=
1.2.8-1), system-java13 | system-java14 | system-java15, xalan-j (>= 2.6.0-1),
xerces-j (>= 2.6.2-1)
+Depends: jta-spec (>= 1.0.1-2), jca (>= 1.0-2), jaas (>= 1.0-1), log4j (>=
1.2.8-1), system-java (>= 1.4-1), xalan-j (>= 2.6.0-1), xerces-j (>= 2.6.2-1)
Source: mirror:sourceforge:%n/%n-%v.tgz
-Source-MD5: dd70aa0778beba346f8b82c93d1e4490
+Source-MD5: f1c9b178bd1840094a6ba80310bfbcdd
SourceDirectory: %n-%v
PatchScript: sed 's:@PREFIX@:%p:g' <%a/%n.patch | patch -p1
-CompileScript: /usr/bin/true
-JarFiles: %n-%v.jar
+CompileScript: echo "none needed"
+JarFiles: %n.jar
InstallScript: <<
- mkdir -p %i/share/doc/%n
- ( cd doc; tar -cf - . | (cd %i/share/doc/%n; tar -xf - ) )
- mkdir -p %i/etc/profile.d
- install -m 755 scripts/%n.sh %i/etc/profile.d/
- install -m 755 scripts/%n.csh %i/etc/profile.d/
+ mv %n-%v.jar %n.jar
+ mkdir -p %i/share/doc/%n
+ ( cd doc; tar -cf - . | (cd %i/share/doc/%n; tar -xf - ) )
+ mkdir -p %i/etc/profile.d
+ install -m 755 scripts/%n.sh %i/etc/profile.d/
+ install -m 755 scripts/%n.csh %i/etc/profile.d/
<<
Homepage: http://tyrex.exolab.org/
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Modified: trunk/experimental/common/main/finkinfo/web/tomcat4.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/web/tomcat4.info&rev=158&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/web/tomcat4.info (original)
+++ trunk/experimental/common/main/finkinfo/web/tomcat4.info Fri Jun 30
04:58:35 2006
@@ -1,6 +1,6 @@
Package: tomcat4
Version: 4.1.31
-Revision: 1
+Revision: 2
Type: java(1.4)
CustomMirror: <<
@@ -8,69 +8,69 @@
nam-US: http://astrange.ithinksw.net/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source: mirror:apache:jakarta/tomcat-4/v%v/src/jakarta-tomcat-%v-src.tar.gz
-Source-MD5: 5f91c7a95d6e5f35152dfed903687479
-SourceDirectory: jakarta-tomcat-%v-src
-Source2:
mirror:apache:jakarta/tomcat-4/v%v/src/jakarta-tomcat-connectors-%v-src.tar.gz
-Source2-MD5: 07a22863a73045c1dced4793e15fa9d0
-Source3: mirror:custom:jakarta-tomcat-jasper-20040718.tar.bz2
-Source3-MD5: 120ab3fad7c841e8a5d03f9f16b60195
+Source: mirror:apache:tomcat/tomcat-4/v%v/bin/jakarta-tomcat-%v-LE-jdk14.tar.gz
+Source-MD5: 7ba7b232ebf78eb7da7b5f27dfeb82b8
+SourceDirectory: jakarta-tomcat-%v
+PatchScript: sed -e 's:@PREFIX@:%p:g' < %a/%n.patch | patch -p1
-BuildDepends: ant (>= 1.6.1-2), fink (>= 0.22.2-1), fink-mirrors (>=
0.22.1.1-1), xalan-j (>= 2.6.0-1), xerces-j (>= 2.6.2-1), jaf (>= 1.0.2-3),
jakarta-servletapi (>= 4.1-1), javamail (>= 1.3-2), jdbc-optional, jndi (>=
1.2.1-4), jndi-ldap (>= 1.2.1-4), jta-spec (>= 1.0.1-2), tyrex (>= 1.0-2),
passwd (>= 20020106), daemonic, commons-beanutils (>= 1.6.1-2),
commons-collections (>= 3.1-2), commons-daemon (>= 1.0-1), commons-dbcp (>=
1.2.1-1), commons-digester (>= 1.5-2), commons-logging (>= 1.0.4-1),
commons-modeler (>= 1.1-2), commons-pool (>= 1.2-1), mx4j (>= 2.0.1-2), struts
(>= 1.1-2), jakarta-regexp (>= 1.3-1), system-java14-dev
-Depends: xalan-j (>= 2.6.0-1), xerces-j (>= 2.6.2-1), jaf (>= 1.0.2-3),
jakarta-servletapi (>= 4.1-1), javamail (>= 1.3-2), jdbc-optional, jndi (>=
1.2.1-4), jndi-ldap (>= 1.2.1-4), jta-spec (>= 1.0.1-2), tyrex (>= 1.0-2),
passwd (>= 20020106), daemonic, commons-beanutils (>= 1.6.1-2),
commons-collections (>= 3.1-2), commons-daemon (>= 1.0-1), commons-dbcp (>=
1.2.1-1), commons-digester (>= 1.5-2), commons-logging (>= 1.0.4-1),
commons-modeler (>= 1.1-2), commons-pool (>= 1.2-1), mx4j (>= 2.0.1-2), struts
(>= 1.1-2), jakarta-regexp (>= 1.3-1), system-java14 | system-java15
+Depends: system-java (>= 1.4-1)
ConfFiles: <<
- %p/etc/%N/tomcat.conf
- %p/var/%N/conf/catalina.policy
- %p/var/%N/conf/server.xml
- %p/var/%N/conf/web.xml
- %p/var/%N/conf/tomcat-users.xml
- %p/share/webapps/admin.xml
- %p/share/webapps/manager.xml
+ %p/etc/%N/tomcat.conf
+ %p/var/%N/conf/catalina.policy
+ %p/var/%N/conf/jk2.properties
+ %p/var/%N/conf/server-noexamples.xml.config
+ %p/var/%N/conf/server.xml
+ %p/var/%N/conf/tomcat-users.xml
+ %p/var/%N/conf/web.xml
<<
Conflicts: tomcat (<< 4.1.30-1)
Replaces: tomcat (<< 4.1.30-1)
Provides: tomcat
-PatchScript: sed 's:@PREFIX@:%p:g' <%a/%n.patch | patch -p1
CompileScript: <<
-#!/bin/sh -ex
- pushd ..
- ln -s jakarta-tomcat-connectors-%v-src jakarta-tomcat-connectors
- popd
- ant detect dist -Dcopy.jdbc20ext.jar=false
+ rsync -avr --exclude=dist ./ dist/
<<
InstallScript: <<
#!/bin/sh -ex
- install -d -m 755 %i/var/%N
- cp -R dist/* %i/var/%N/
- find %i/var/%N -type d -exec chmod 755 {} \;
- find %i/var/%N -type f -exec chmod 644 {} \;
- chmod 755 %i/var/%N/bin/*.sh
- rm -rf %i/var/%N/bin/*.bat
- install -d -m 755 %i/share/doc/%N
- mv %i/var/%N/*.txt %i/var/%N/LICENSE %i/share/doc/%N/
- chown -R tomcat:tomcat %i/var/%N
- install -d -m 755 %i/bin
- cp tomcat %i/bin/%N
- chmod 755 %i/bin/%N
- install -d -m 755 %i/var/log
- chown tomcat:tomcat %i/var/log
- chmod 2775 %i/var/log
- ln -sf %p/var/%N/logs %i/var/log/%N
- install -d -m 755 %i/share/webapps
- mv %i/var/%N/webapps/* %i/share/webapps/
- rmdir %i/var/%N/webapps
- pushd %i/var/%N
- ln -sf ../../share/webapps webapps
- popd
- install -d -m 755 %i/etc
- pushd %i/etc
- ln -sf ../var/%N/conf tomcat
- popd
- install -d -m 755 %i/etc/%N
- install -m 644 tomcat.conf %i/etc/%N/
- pushd %i/var/%N/server/lib
- ln -sf %p/share/java/mx4j/mx4j.jar .
- sudo chmod 0775 %i/share/webapps/* %i/var/%N/logs
+
+ # main install
+ install -d -m 755 %i/var/%N
+ cp -R dist/* %i/var/%N/
+
+ # scripts
+ rm -rf %i/var/%N/bin/*.bat
+ install -d -m 755 %i/bin
+ install -c -m 755 tomcat %i/bin/%N
+
+ # fix up perms
+ find %i/var/%N -type d -exec chmod 755 {} \;
+ find %i/var/%N -type f -exec chmod 644 {} \;
+ chmod 755 %i/var/%N/bin/*.sh
+ chown -R tomcat:tomcat %i/var/%N
+
+ # docs
+ install -d -m 755 %i/share/doc/%N
+ mv %i/var/%N/*.txt %i/var/%N/LICENSE %i/share/doc/%N/
+
+ # logs
+ install -d -m 755 %i/var/log
+ chown tomcat:tomcat %i/var/log
+ chmod 2775 %i/var/log
+ ln -sf %p/var/%N/logs %i/var/log/%N
+
+ # web apps
+ install -d -m 755 %i/share/webapps
+ mv %i/var/%N/webapps/* %i/share/webapps/
+ rmdir %i/var/%N/webapps
+ pushd %i/var/%N
+ ln -sf ../../share/webapps webapps
+ popd
+
+ # configuration files
+ install -d -m 755 %i/etc/%N
+ install -m 644 tomcat.conf %i/etc/%N/
+
+ # misc
+ sudo chmod 0775 %i/share/webapps/* %i/var/%N/logs
<<
DaemonicFile: <<
<service>
@@ -84,16 +84,29 @@
<<
PostInstScript: <<
-# update daemonic init script if necessary
-daemonic install %N
+ # update daemonic init script if necessary
+ [ -x %p/bin/daemonic ] && daemonic install %N
<<
PreRmScript: <<
-# clean up
-if [ $1 != "upgrade" ]; then
- daemonic remove %N
- rm -rf %p/%N/work/*
- rm -rf %p/%N/logs/*
-fi
+ # clean up
+ if [ $1 != "upgrade" ] && [ -x %p/bin/daemonic ]; then
+ daemonic remove %N
+ rm -rf %p/%N/work/*
+ rm -rf %p/%N/logs/*
+ fi
+<<
+
+Recommends: %N-webapps
+SplitOff: <<
+ Package: %N-webapps
+ Files: share/webapps
+ Depends: %N (>= %v-%r)
+ Conflicts: tomcat5-webapps
+ Replaces: tomcat, tomcat4, tomcat5, tomcat5-webapps
+ ConfFiles: <<
+ %p/share/webapps/admin.xml
+ %p/share/webapps/manager.xml
+ <<
<<
Homepage: http://jakarta.apache.org/tomcat/index.html
@@ -115,11 +128,6 @@
the way it's set up in the RedHat packages and put it in /var/tomcat4
(I think debian does it this way as well.)
<<
-DescPort: <<
-All that has changed is the defaults for building, and a wrapper script
-for starting/stopping tomcat that goes in the %p/bin directory, along
-with a daemonic config.
-<<
DescUsage: <<
To start, stop, or restart Tomcat, do:
Modified: trunk/experimental/common/main/finkinfo/web/tomcat4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/web/tomcat4.patch&rev=158&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/web/tomcat4.patch (original)
+++ trunk/experimental/common/main/finkinfo/web/tomcat4.patch Fri Jun 30
04:58:35 2006
@@ -1,280 +1,6 @@
-diff -uNr jakarta-tomcat-4.1.31-src/build.properties
jakarta-tomcat-4.1.31-src-new/build.properties
---- jakarta-tomcat-4.1.31-src/build.properties Wed Dec 31 19:00:00 1969
-+++ jakarta-tomcat-4.1.31-src-new/build.properties Wed Oct 27 11:00:22 2004
-@@ -0,0 +1,235 @@
-+#
-----------------------------------------------------------------------------
-+# build.properties.sample
-+#
-+# This is an example "build.properties" file, used to customize building
Tomcat
-+# for your local environment. It defines the location of all external
-+# modules that Tomcat depends on. Copy this file to "build.properties"
-+# in the top-level source directory, and customize it as needed.
-+#
-+# $Id: build.properties.sample,v 1.54 2002/11/12 16:34:57 jfarcand Exp $
-+#
-----------------------------------------------------------------------------
-+
-+
-+# ----- Compile Control Flags -----
-+compile.debug=on
-+compile.deprecation=off
-+compile.optimize=on
-+
-+
-+# ----- Build Control Flags
-+
-+#Build all components
-+full.dist=on
-+
-+#Build lightweight JDK 1.4 distribution
-+#light.dist=on
-+
-+#Hide configuration flags display
-+#flags.hide=on
-+
-+#Version number
-+version=4.1
-+
-+#Proxy to download subproject
-+#proxy.host=proxy.domain
-+#proxy.port=8080
-+#proxy.use=on
-+
-+#CVS root for the jakarta subprojects that do not have released yet.
-+cvsroot=":pserver:[EMAIL PROTECTED]:/home/cvspublic"
-+
-+
-+# ----- Default Base Path for Dependent Packages -----
[EMAIL PROTECTED]@
-+java.base.path=${base.path}/share/java
-+
-+# ----- Jakarta Tomcat Connectors source path -----
-+#jtc.home=../../jakarta-tomcat-connectors
-+
-+
-+# ----- Jakarta Tomcat Jasper source path -----
-+jasper.home=${basedir}/jasper
-+
-+
-+# --------------------------------------------------
-+# REQUIRED LIBRARIES
-+# --------------------------------------------------
-+
-+
-+# ----- Commons Beanutils, version 1.1 or later -----
-+commons-beanutils.home=${java.base.path}/commons-beanutils
-+commons-beanutils.lib=${commons-beanutils.home}
-+commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
-+commons-beanutils.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.4.1/commons-beanutils-1.4.1.tar.gz
-+
-+
-+# ----- Commons Collections, version 1.0 or later -----
-+commons-collections.home=${java.base.path}/commons-collections
-+commons-collections.lib=${commons-collections.home}
-+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
-+commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0.tar.gz
-+
-+
-+# ----- Commons Digester, version 1.1.1 or later -----
-+commons-digester.home=${java.base.path}/commons-digester
-+commons-digester.lib=${commons-digester.home}
-+commons-digester.jar=${commons-digester.lib}/commons-digester.jar
-+commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
-+
-+
-+# ----- Commons Logging, version 1.0.1 or later -----
-+commons-logging.home=${java.base.path}/commons-logging
-+commons-logging.lib=${commons-logging.home}
-+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
-+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
-+commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.2/commons-logging-1.0.2.tar.gz
-+
-+
-+# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
-+# Note: Optional with JDK 1.3+
-+jndi.home=${java.base.path}/jndi
-+jndi.lib=${jndi.home}
-+jndi.jar=${jndi.lib}/jndi.jar
-+ldap.jar=${java.base.path}/jndi-ldap/ldap.jar
-+jaas.jar=${java.base.path}/jndi-ldap/jaas.jar
-+
-+
-+# ----- Jakarta Regular Expressions Library, version 1.2 -----
-+regexp.home=${java.base.path}/jakarta-regexp
-+regexp.lib=${regexp.home}
-+regexp.jar=${regexp.lib}/jakarta-regexp.jar
-+regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
-+
-+
-+# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
-+servlet.home=${java.base.path}/jakarta-servletapi
-+servlet.lib=${servlet.home}
-+servlet.jar=${servlet.lib}/servlet.jar
-+servlet.loc=jakarta-servletapi-4
-+
-+
-+# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
-+# Note: Optional with JDK 1.4+
-+#xerces.home=${base.path}/xerces-1_4_4
-+#xerces.lib=${xerces.home}
-+#xerces.jar=${xerces.lib}/xerces.jar
-+
-+
-+# ----- Xerces XML Parser, version 2.0.0 or later -----
-+# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
-+xerces.home=${java.base.path}/xerces-j
-+xerces.lib=${xerces.home}
-+xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.1.0.tar.gz
-+xercesImpl.jar=${xerces.lib}/xercesImpl.jar
-+xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
-+
-+
-+# --------------------------------------------------
-+# OPTIONAL LIBRARIES
-+# --------------------------------------------------
-+
-+
-+# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
-+activation.home=${java.base.path}/jaf
-+activation.lib=${activation.home}
-+activation.jar=${activation.lib}/activation.jar
-+
-+
-+# ----- Commons Daemon, version 20020219 or later -----
-+commons-daemon.home=${java.base.path}/commons-daemon
-+commons-daemon.lib=${commons-daemon.home}
-+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-+commons-daemon.loc=jakarta-commons-sandbox/daemon
-+
-+
-+# ----- Commons DBCP, version 1.0 or later -----
-+commons-dbcp.home=${java.base.path}/commons-dbcp
-+commons-dbcp.lib=${commons-dbcp.home}
-+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
-+commons-dbcp.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-dbcp/v1.0/commons-dbcp-1.0.zip
-+
-+
-+# ----- Commons Modeler, version 1.0 or later -----
-+commons-modeler.home=${java.base.path}/commons-modeler
-+commons-modeler.lib=${commons-modeler.home}
-+commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
-+commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
-+
-+
-+# ----- Commons Pool, version 1.0 or later -----
-+commons-pool.home=${java.base.path}/commons-pool
-+commons-pool.lib=${commons-pool.home}
-+commons-pool.jar=${commons-pool.lib}/commons-pool.jar
-+commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0.1/commons-pool-1.0.1.tar.gz
-+
-+
-+# ----- JavaService, version 1.2.0 or later -----
-+javaservice.home=${base.path}/javaservice
-+javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
-+
-+
-+# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
-+jdbc20ext.home=${java.base.path}/jdbc-optional
-+jdbc20ext.lib=${jdbc20ext.home}
-+jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
-+
-+
-+# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1
or later -----
-+jmx.home=${java.base.path}/mx4j
-+jmx.lib=${jmx.home}
-+jmx.jar=${jmx.lib}/mx4j-jmx.jar
-+jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz
-+
-+
-+# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
-+jsse.home=/Library/Java/Home
-+jsse.lib=${jsse.home}/lib
-+jcert.jar=${jsse.lib}/jcert.jar
-+jnet.jar=${jsse.lib}/jnet.jar
-+jsse.jar=${jsse.lib}/jsse.jar
-+
-+
-+# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-+jta.home=${java.base.path}/jta-spec
-+jta.lib=${jta.home}
-+jta.jar=${jta.lib}/jta-spec1_0_1.jar
-+
-+
-+# ----- JUnit Unit Test Suite, version 3.7 or later -----
-+junit.home=${java.base.path}/junit
-+junit.lib=${junit.home}
-+junit.jar=${junit.lib}/junit.jar
-+junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
-+
-+
-+# ----- Java Mail, version 1.2 or later -----
-+mail.home=${java.base.path}/javamail
-+mail.lib=${mail.home}
-+mail.jar=${mail.lib}/mail.jar
-+
-+
-+# ----- NSIS, version 1.9x -----
-+nsis.home=${base.path}/nsis
-+nsis.loc=http://www.nullsoft.com/free/nsis/nsis198.exe
-+
-+
-+# ----- PureTLS Extension, version 0.9 or later -----
-+puretls.home=${base.path}/puretls-0.9b2
-+puretls.lib=${puretls.home}/build
-+puretls.jar=${puretls.lib}/puretls.jar
-+
-+
-+# ----- Struts, version 1.0.1 or later -----
-+struts.home=${java.base.path}/struts
-+struts.lib=${struts.home}
-+struts.jar=${struts.lib}/struts.jar
-+struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.2/jakarta-struts-1.0.2.tar.gz
-+
-+
-+# ----- Tyrex Data Source, version 1.0 -----
-+tyrex.home=${java.base.path}/tyrex
-+tyrex.lib=${tyrex.home}
-+tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
-+tyrex.loc=ftp://ftp.exolab.org/pub/tyrex/tyrex-1.0/tyrex-1.0.jar
-+
-+
-diff -uNr jakarta-tomcat-4.1.31-src/build.sh
jakarta-tomcat-4.1.31-src-new/build.sh
---- jakarta-tomcat-4.1.31-src/build.sh Wed Dec 31 19:00:00 1969
-+++ jakarta-tomcat-4.1.31-src-new/build.sh Wed Oct 27 11:00:22 2004
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+
-+for i in @PREFIX@/etc/profile.d/*.sh; do
-+ source $i
-+done
-+
-+ant dist
-diff -uNr jakarta-tomcat-4.1.31-src/build.xml
jakarta-tomcat-4.1.31-src-new/build.xml
---- jakarta-tomcat-4.1.31-src/build.xml Sat Sep 25 12:44:17 2004
-+++ jakarta-tomcat-4.1.31-src-new/build.xml Wed Oct 27 11:00:22 2004
-@@ -19,7 +19,7 @@
- <property name="jtc.project" value="jakarta-tomcat-connectors" />
- <property name="jtc.final.name" value="${jtc.project}-${version}" />
- <property name="jtc.final-src.name"
value="${jtc.project}-${version}-src" />
-- <property name="servlet.doc" value="${servlet.home}/docs/api" />
-+ <property name="servlet.doc"
value="${base.path}/share/doc/jakarta-servletapi/api" />
-
- <!-- Build Defaults -->
- <property name="catalina.build" value="${basedir}/catalina/build"/>
-diff -uNr jakarta-tomcat-4.1.31-src/catalina/build.xml
jakarta-tomcat-4.1.31-src-new/catalina/build.xml
---- jakarta-tomcat-4.1.31-src/catalina/build.xml Sat Sep 25 12:44:17 2004
-+++ jakarta-tomcat-4.1.31-src-new/catalina/build.xml Wed Oct 27 11:00:22 2004
-@@ -696,7 +696,7 @@
- <copy todir="${catalina.build}/server/lib" file="${jaas.jar}"/>
- </target>
- <target name="copy-jdbc20ext.jar" if="copy.jdbc20ext.jar">
-- <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
-+ <!-- <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
-->
- </target>
- <target name="copy-jmx.jar" if="copy.jmx.jar">
- <copy todir="${catalina.build}/server/lib" file="${jmx.jar}"/>
-diff -uNr jakarta-tomcat-4.1.31-src/tomcat jakarta-tomcat-4.1.31-src-new/tomcat
---- jakarta-tomcat-4.1.31-src/tomcat Wed Dec 31 19:00:00 1969
-+++ jakarta-tomcat-4.1.31-src-new/tomcat Wed Oct 27 11:38:32 2004
+diff -uNr jakarta-tomcat-4.1.31/tomcat jakarta-tomcat-4.1.31-new/tomcat
+--- jakarta-tomcat-4.1.31/tomcat 1969-12-31 19:00:00.000000000 -0500
++++ jakarta-tomcat-4.1.31-new/tomcat 2006-06-29 21:36:20.000000000 -0400
@@ -0,0 +1,58 @@
+#!/bin/sh
+# wrapper script for tomcat startup
@@ -334,9 +60,9 @@
+ ;;
+
+esac
-diff -uNr jakarta-tomcat-4.1.31-src/tomcat.conf
jakarta-tomcat-4.1.31-src-new/tomcat.conf
---- jakarta-tomcat-4.1.31-src/tomcat.conf Wed Dec 31 19:00:00 1969
-+++ jakarta-tomcat-4.1.31-src-new/tomcat.conf Wed Oct 27 11:00:22 2004
+diff -uNr jakarta-tomcat-4.1.31/tomcat.conf
jakarta-tomcat-4.1.31-new/tomcat.conf
+--- jakarta-tomcat-4.1.31/tomcat.conf 1969-12-31 19:00:00.000000000 -0500
++++ jakarta-tomcat-4.1.31-new/tomcat.conf 2006-06-29 21:36:20.000000000
-0400
@@ -0,0 +1,11 @@
+# location of your JDK
+JAVA_HOME=/Library/Java/Home export JAVA_HOME
@@ -349,27 +75,27 @@
+# feel free to add to this, but please don't remove the TOMCATLAUNCH,
+# it is used for finding tomcat processes
+CATALINA_OPTS="-DTOMCATLAUNCH=true" export CATALINA_OPTS
-diff -uNr jakarta-tomcat-4.1.31-src/webapps/admin/admin.xml
jakarta-tomcat-4.1.31-src-new/webapps/admin/admin.xml
---- jakarta-tomcat-4.1.31-src/webapps/admin/admin.xml Sat Sep 25 12:44:23 2004
-+++ jakarta-tomcat-4.1.31-src-new/webapps/admin/admin.xml Wed Oct 27
11:00:22 2004
+diff -uNr jakarta-tomcat-4.1.31/webapps/admin.xml
jakarta-tomcat-4.1.31-new/webapps/admin.xml
+--- jakarta-tomcat-4.1.31/webapps/admin.xml 2004-09-25 10:19:15.000000000
-0400
++++ jakarta-tomcat-4.1.31-new/webapps/admin.xml 2006-06-29
21:36:40.000000000 -0400
@@ -7,7 +7,7 @@
- -->
-
-
--<Context path="/admin" docBase="../server/webapps/admin"
-+<Context path="/admin" docBase="@PREFIX@/var/tomcat4/server/webapps/admin"
- debug="0" privileged="true">
-
- <!-- Uncomment this Valve to limit access to the Admin app to localhost
-diff -uNr jakarta-tomcat-4.1.31-src/webapps/manager/manager.xml
jakarta-tomcat-4.1.31-src-new/webapps/manager/manager.xml
---- jakarta-tomcat-4.1.31-src/webapps/manager/manager.xml Sat Sep 25
12:44:24 2004
-+++ jakarta-tomcat-4.1.31-src-new/webapps/manager/manager.xml Wed Oct 27
11:00:22 2004
+ -->
+
+
+-<Context path="/admin" docBase="../server/webapps/admin"
++<Context path="/admin" docBase="@PREFIX@/var/tomcat4/server/webapps/admin"
+ debug="0" privileged="true">
+
+ <!-- Uncomment this Valve to limit access to the Admin app to localhost
+diff -uNr jakarta-tomcat-4.1.31/webapps/manager.xml
jakarta-tomcat-4.1.31-new/webapps/manager.xml
+--- jakarta-tomcat-4.1.31/webapps/manager.xml 2004-09-25 10:19:11.000000000
-0400
++++ jakarta-tomcat-4.1.31-new/webapps/manager.xml 2006-06-29
21:36:59.000000000 -0400
@@ -7,7 +7,7 @@
- -->
-
-
--<Context path="/manager" docBase="../server/webapps/manager"
-+<Context path="/manager" docBase="@PREFIX@/var/tomcat4/server/webapps/manager"
- debug="0" privileged="true">
-
- <!-- Link to the user database we will get roles from -->
+ -->
+
+
+-<Context path="/manager" docBase="../server/webapps/manager"
++<Context path="/manager" docBase="@PREFIX@/var/tomcat4/server/webapps/manager"
+ debug="0" privileged="true">
+
+ <!-- Link to the user database we will get roles from -->
Modified: trunk/experimental/common/main/finkinfo/web/tomcat5.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/web/tomcat5.info&rev=158&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/web/tomcat5.info (original)
+++ trunk/experimental/common/main/finkinfo/web/tomcat5.info Fri Jun 30
04:58:35 2006
@@ -1,82 +1,86 @@
Package: tomcat5
-Version: 5.0.27
+Version: 5.5.17
Revision: 1
+Type: java(1.4)
CustomMirror: <<
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
-Source:
http://www.apache.org/dist/jakarta/%n-4/v%v/src/jakarta-%n-%v-src.tar.gz
-Source-MD5: 4d623370268c34e9853b9b69b84d7858
-SourceDirectory: jakarta-%n-%v-src
-Source2:
http://www.apache.org/dist/jakarta/%n-4/v%v/src/jakarta-%n-connectors-%v-src.tar.gz
-Source2-MD5: d8df80f1249349eede5ec02394613c89
-#Source3: mirror:custom:jakarta-%n-jasper-20040718.tar.bz2
-#Source3-MD5: 120ab3fad7c841e8a5d03f9f16b60195
+Source: mirror:apache:tomcat/tomcat-5/v%v/bin/apache-tomcat-%v.tar.gz
+Source-MD5: 994d39c0d2f462c79288e0249991dd49
+Source2: mirror:apache:tomcat/tomcat-5/v%v/bin/apache-tomcat-%v-admin.tar.gz
+Source2-MD5: 3823b82ec4df902cd10eadf69aac1594
+Source3: mirror:apache:tomcat/tomcat-5/v%v/bin/apache-tomcat-%v-compat.tar.gz
+Source3-MD5: 27aca181f2cc19b97b5ac9beeb711244
+PatchScript: sed -e 's:@PREFIX@:%p:g' < %a/%n.patch | patch -p1
-BuildDepends: ant (>= 1.6.1-2), xalan-j (>= 2.6.0-1), xerces-j (>= 2.6.2-1),
jaf (>= 1.0.2-3), jakarta-servletapi (>= 4.1-1), javamail (>= 1.3-2),
jdbc-optional, jndi (>= 1.2.1-4), jndi-ldap (>= 1.2.1-4), jta-spec (>=
1.0.1-2), tyrex (>= 1.0-2), passwd (>= 20020106), daemonic, commons-beanutils
(>= 1.6.1-2), commons-collections (>= 3.1-2), commons-daemon (>= 1.0-1),
commons-dbcp (>= 1.2.1-1), commons-digester (>= 1.5-2), commons-logging (>=
1.0.4-1), commons-modeler (>= 1.1-2), commons-pool (>= 1.2-1), mx4j (>=
2.0.1-2), struts (>= 1.1-2), jakarta-regexp (>= 1.3-1), system-java14-dev
-Depends: xalan-j (>= 2.6.0-1), xerces-j (>= 2.6.2-1), jaf (>= 1.0.2-3),
jakarta-servletapi (>= 4.1-1), javamail (>= 1.3-2), jdbc-optional, jndi (>=
1.2.1-4), jndi-ldap (>= 1.2.1-4), jta-spec (>= 1.0.1-2), tyrex (>= 1.0-2),
passwd (>= 20020106), daemonic, commons-beanutils (>= 1.6.1-2),
commons-collections (>= 3.1-2), commons-daemon (>= 1.0-1), commons-dbcp (>=
1.2.1-1), commons-digester (>= 1.5-2), commons-logging (>= 1.0.4-1),
commons-modeler (>= 1.1-2), commons-pool (>= 1.2-1), mx4j (>= 2.0.1-2), struts
(>= 1.1-2), jakarta-regexp (>= 1.3-1), system-java14 | system-java15
+Depends: system-java (>= 1.4-1)
ConfFiles: <<
- %p/var/%N/conf/tomcat.conf
- %p/var/%N/conf/catalina.policy
- %p/var/%N/conf/server.xml
- %p/var/%N/conf/web.xml
- %p/var/%N/conf/tomcat-users.xml
- %p/share/webapps/admin.xml
- %p/share/webapps/manager.xml
+ %p/etc/%N/tomcat.conf
+ %p/var/%N/conf/catalina.policy
+ %p/var/%N/conf/catalina.properties
+ %p/var/%N/conf/context.xml
+ %p/var/%N/conf/logging.properties
+ %p/var/%N/conf/server-minimal.xml
+ %p/var/%N/conf/server.xml
+ %p/var/%N/conf/tomcat-users.xml
+ %p/var/%N/conf/web.xml
<<
Conflicts: tomcat (<< 4.1.30-1)
Replaces: tomcat (<< 4.1.30-1)
-PatchScript: sed 's:@PREFIX@:%p:g' <%a/%n.patch | patch -p1
+Provides: tomcat
CompileScript: <<
-#!/bin/sh
-
- JAVAVER=`find /System/Library/Frameworks/JavaVM.framework/Versions -name
include 2>/dev/null | perl -p -e 's,.*Versions/(.*?)/.*,$1,g' | grep -E '^1.4'
| tail -1`
- export
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/$JAVAVER/Home
- export PATH="$JAVA_HOME/bin:$PATH"
-
- pushd ..
- ln -s jakarta-tomcat-connectors-%v-src jakarta-tomcat-connectors
- popd
- ant detect dist -Dcopy.jdbc20ext.jar=false
+ rsync -avr --exclude=dist ./ dist/
<<
InstallScript: <<
-#!/bin/sh
- mkdir -p %i/var/%N
- cp -R dist/* %i/var/%N/
- find %i/var/%N -type d -exec chmod 755 {} \;
- find %i/var/%N -type f -exec chmod 644 {} \;
- chmod 755 %i/var/%N/bin/*.sh
- rm -rf %i/var/%N/bin/*.bat
- mkdir -p %i/share/doc/%n
- mv %i/var/%N/*.txt %i/var/%N/LICENSE %i/share/doc/%n/
- chown -R tomcat:tomcat %i/var/%N
- mkdir -p %i/bin
- cp tomcat %i/bin/%N
- chmod 755 %i/bin/%N
- mkdir -p %i/var/log
- chown tomcat:tomcat %i/var/log
- dhmod 2775 %i/var/log
- ln -sf %p/var/%N/logs %i/var/log/%N
- mkdir -p %i/share/webapps
- mv %i/var/%N/webapps/* %i/share/webapps/
- rmdir %i/var/%N/webapps
- pushd %i/var/%N
- ln -sf ../../share/webapps webapps
- popd
- mkdir -p %i/etc
- pushd %i/etc
- ln -sf ../var/%N/conf tomcat
- popd
- install -m 644 tomcat.conf %i/etc/%N/
- pushd %i/var/%N/server/lib
- ln -sf %p/share/java/mx4j/mx4j.jar .
+#!/bin/sh -ex
+
+ # main install
+ install -d -m 755 %i/var/%N
+ cp -R dist/* %i/var/%N/
+
+ # scripts
+ rm -rf %i/var/%N/bin/*.bat
+ install -d -m 755 %i/bin
+ install -c -m 755 tomcat %i/bin/%N
+
+ # fix up perms
+ find %i/var/%N -type d -exec chmod 755 {} \;
+ find %i/var/%N -type f -exec chmod 644 {} \;
+ chmod 755 %i/var/%N/bin/*.sh
+ chown -R tomcat:tomcat %i/var/%N
+
+ # docs
+ install -d -m 755 %i/share/doc/%N
+ mv %i/var/%N/*.txt %i/var/%N/LICENSE %i/share/doc/%N/
+
+ # logs
+ install -d -m 755 %i/var/log
+ chown tomcat:tomcat %i/var/log
+ chmod 2775 %i/var/log
+ ln -sf %p/var/%N/logs %i/var/log/%N
+
+ # web apps
+ install -d -m 755 %i/share/webapps
+ mv %i/var/%N/webapps/* %i/share/webapps/
+ rmdir %i/var/%N/webapps
+ pushd %i/var/%N
+ ln -sf ../../share/webapps webapps
+ popd
+
+ # configuration files
+ install -d -m 755 %i/etc/%N
+ install -m 644 tomcat.conf %i/etc/%N/
+
+ # misc
+ sudo chmod 0775 %i/share/webapps/* %i/var/%N/logs
<<
DaemonicFile: <<
<service>
- <description>Tomcat servlet 2.3 engine</description>
- <message>Tomcat servlet 2.3 engine</message>
+ <description>Tomcat servlet 2.4 engine</description>
+ <message>Tomcat servlet 2.4 engine</message>
<daemon name="%N">
<executable background="no">/usr/bin/sudo</executable>
<parameters>-u tomcat %p/bin/%N start</parameters>
@@ -85,44 +89,49 @@
<<
PostInstScript: <<
-# update daemonic init script if necessary
-chown -R tomcat:tomcat %p/var/log
-chmod 2775 %p/var/log
-chmod 664 %p/var/log/*
-daemonic install %N
+ # update daemonic init script if necessary
+ [ -x %p/bin/daemonic ] && daemonic install %N
<<
PreRmScript: <<
-# clean up
-if [ $1 != "upgrade" ]; then
- daemonic remove %N
- rm -rf %p/%N/work/*
- rm -rf %p/%N/logs/*
-fi
+ # clean up
+ if [ $1 != "upgrade" ] && [ -x %p/bin/daemonic ]; then
+ daemonic remove %N
+ rm -rf %p/%N/work/*
+ rm -rf %p/%N/logs/*
+ fi
+<<
+
+Recommends: %N-webapps
+SplitOff: <<
+ Package: %N-webapps
+ Files: <<
+ share/webapps
+ var/%N/conf/Catalina/localhost/*
+ <<
+ ConfFiles: <<
+ %p/var/%N/conf/Catalina/localhost/admin.xml
+ %p/var/%N/conf/Catalina/localhost/host-manager.xml
+ %p/var/%N/conf/Catalina/localhost/manager.xml
+ <<
+ Depends: %N (>= %v-%r)
+ Conflicts: tomcat4-webapps
+ Replaces: tomcat, tomcat4, tomcat4-webapps, tomcat5
<<
Homepage: http://jakarta.apache.org/tomcat/index.html
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Description: Java Servlet 2.3 Container and Web Server
+Description: Java Servlet 2.4 Container and Web Server
DescDetail: <<
-Tomcat is the servlet container that is used in the official Reference
-Implementation for the Java Servlet and JavaServer Pages technologies.
-The Java Servlet and JavaServer Pages specifications are developed by
-Sun under the Java Community Process.
-
-Tomcat 4.0 implements a new servlet container (called Catalina) that is
-based on completely new architecture. The 4.0 release implements the
-Servlet 2.3 and JSP 1.2 specifications.
+Apache Tomcat version 5.5 implements the Servlet 2.4 and JavaServer Pages
+2.0 specifications from the Java Community Process, and includes many
+additional features that make it a useful platform for developing and
+deploying web applications and web services.
<<
DescPackaging: <<
Tomcat is designed to be somewhat self-contained, and so does not fit
the fink (and debian, for that matter) packaging guidelines. I followed
-the way it's set up in the RedHat packages and put it in /var/tomcat4
+the way it's set up in the RedHat packages and put it in /var/tomcat5
(I think debian does it this way as well.)
-<<
-DescPort: <<
-All that has changed is the defaults for building, and a wrapper script
-for starting/stopping tomcat that goes in the %p/bin directory, along
-with a daemonic config.
<<
DescUsage: <<
To start, stop, or restart Tomcat, do:
Modified: trunk/experimental/common/main/finkinfo/web/tomcat5.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/web/tomcat5.patch&rev=158&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/web/tomcat5.patch (original)
+++ trunk/experimental/common/main/finkinfo/web/tomcat5.patch Fri Jun 30
04:58:35 2006
@@ -1,301 +1,33 @@
-diff -uNr jakarta-tomcat-4.1.30-src/build.properties
jakarta-tomcat-4.1.30-src-new/build.properties
---- jakarta-tomcat-4.1.30-src/build.properties 1969-12-31 19:00:00.000000000
-0500
-+++ jakarta-tomcat-4.1.30-src-new/build.properties 2004-07-18
17:19:35.000000000 -0400
-@@ -0,0 +1,235 @@
-+#
-----------------------------------------------------------------------------
-+# build.properties.sample
-+#
-+# This is an example "build.properties" file, used to customize building
Tomcat
-+# for your local environment. It defines the location of all external
-+# modules that Tomcat depends on. Copy this file to "build.properties"
-+# in the top-level source directory, and customize it as needed.
-+#
-+# $Id: build.properties.sample,v 1.54 2002/11/12 16:34:57 jfarcand Exp $
-+#
-----------------------------------------------------------------------------
-+
-+
-+# ----- Compile Control Flags -----
-+compile.debug=on
-+compile.deprecation=off
-+compile.optimize=on
-+
-+
-+# ----- Build Control Flags
-+
-+#Build all components
-+full.dist=on
-+
-+#Build lightweight JDK 1.4 distribution
-+#light.dist=on
-+
-+#Hide configuration flags display
-+#flags.hide=on
-+
-+#Version number
-+version=4.1
-+
-+#Proxy to download subproject
-+#proxy.host=proxy.domain
-+#proxy.port=8080
-+#proxy.use=on
-+
-+#CVS root for the jakarta subprojects that do not have released yet.
-+cvsroot=":pserver:[EMAIL PROTECTED]:/home/cvspublic"
-+
-+
-+# ----- Default Base Path for Dependent Packages -----
[EMAIL PROTECTED]@
-+java.base.path=${base.path}/share/java
-+
-+# ----- Jakarta Tomcat Connectors source path -----
-+#jtc.home=../../jakarta-tomcat-connectors
-+
-+
-+# ----- Jakarta Tomcat Jasper source path -----
-+jasper.home=${basedir}/jasper
-+
-+
-+# --------------------------------------------------
-+# REQUIRED LIBRARIES
-+# --------------------------------------------------
-+
-+
-+# ----- Commons Beanutils, version 1.1 or later -----
-+commons-beanutils.home=${java.base.path}/commons-beanutils
-+commons-beanutils.lib=${commons-beanutils.home}
-+commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
-+commons-beanutils.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils/v1.4.1/commons-beanutils-1.4.1.tar.gz
-+
-+
-+# ----- Commons Collections, version 1.0 or later -----
-+commons-collections.home=${java.base.path}/commons-collections
-+commons-collections.lib=${commons-collections.home}
-+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
-+commons-collections.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.0/commons-collections-2.0.tar.gz
-+
-+
-+# ----- Commons Digester, version 1.1.1 or later -----
-+commons-digester.home=${java.base.path}/commons-digester
-+commons-digester.lib=${commons-digester.home}
-+commons-digester.jar=${commons-digester.lib}/commons-digester.jar
-+commons-digester.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-digester/v1.2/commons-digester-1.2.tar.gz
-+
-+
-+# ----- Commons Logging, version 1.0.1 or later -----
-+commons-logging.home=${java.base.path}/commons-logging
-+commons-logging.lib=${commons-logging.home}
-+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
-+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
-+commons-logging.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.2/commons-logging-1.0.2.tar.gz
-+
-+
-+# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
-+# Note: Optional with JDK 1.3+
-+jndi.home=${java.base.path}/jndi
-+jndi.lib=${jndi.home}
-+jndi.jar=${jndi.lib}/jndi.jar
-+ldap.jar=${java.base.path}/jndi-ldap/ldap.jar
-+jaas.jar=${java.base.path}/jndi-ldap/jaas.jar
-+
-+
-+# ----- Jakarta Regular Expressions Library, version 1.2 -----
-+regexp.home=${java.base.path}/jakarta-regexp
-+regexp.lib=${regexp.home}
-+regexp.jar=${regexp.lib}/jakarta-regexp.jar
-+regexp.loc=http://jakarta.apache.org/builds/jakarta-regexp/release/v1.2/jakarta-regexp-1.2.tar.gz
-+
-+
-+# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
-+servlet.home=${java.base.path}/jakarta-servletapi
-+servlet.lib=${servlet.home}
-+servlet.jar=${servlet.lib}/servlet.jar
-+servlet.loc=jakarta-servletapi-4
-+
-+
-+# ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----
-+# Note: Optional with JDK 1.4+
-+#xerces.home=${base.path}/xerces-1_4_4
-+#xerces.lib=${xerces.home}
-+#xerces.jar=${xerces.lib}/xerces.jar
-+
-+
-+# ----- Xerces XML Parser, version 2.0.0 or later -----
-+# Note: Optional with JDK 1.4+, or if Xerces 1.x is present
-+xerces.home=${java.base.path}/xerces-j
-+xerces.lib=${xerces.home}
-+xerces.loc=http://xml.apache.org/dist/xerces-j/old_xerces2/Xerces-J-bin.2.1.0.tar.gz
-+xercesImpl.jar=${xerces.lib}/xercesImpl.jar
-+xmlParserAPIs.jar=${xerces.lib}/xmlParserAPIs.jar
-+
-+
-+# --------------------------------------------------
-+# OPTIONAL LIBRARIES
-+# --------------------------------------------------
-+
-+
-+# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
-+activation.home=${java.base.path}/jaf
-+activation.lib=${activation.home}
-+activation.jar=${activation.lib}/activation.jar
-+
-+
-+# ----- Commons Daemon, version 20020219 or later -----
-+commons-daemon.home=${java.base.path}/commons-daemon
-+commons-daemon.lib=${commons-daemon.home}
-+commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-+commons-daemon.loc=jakarta-commons-sandbox/daemon
-+
-+
-+# ----- Commons DBCP, version 1.0 or later -----
-+commons-dbcp.home=${java.base.path}/commons-dbcp
-+commons-dbcp.lib=${commons-dbcp.home}
-+commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar
-+commons-dbcp.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-dbcp/v1.0/commons-dbcp-1.0.zip
-+
-+
-+# ----- Commons Modeler, version 1.0 or later -----
-+commons-modeler.home=${java.base.path}/commons-modeler
-+commons-modeler.lib=${commons-modeler.home}
-+commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar
-+commons-modeler.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-modeler/v1.0/commons-modeler-1.0.tar.gz
-+
-+
-+# ----- Commons Pool, version 1.0 or later -----
-+commons-pool.home=${java.base.path}/commons-pool
-+commons-pool.lib=${commons-pool.home}
-+commons-pool.jar=${commons-pool.lib}/commons-pool.jar
-+commons-pool.loc=http://jakarta.apache.org/builds/jakarta-commons/release/commons-pool/v1.0.1/commons-pool-1.0.1.tar.gz
-+
-+
-+# ----- JavaService, version 1.2.0 or later -----
-+javaservice.home=${base.path}/javaservice
-+javaservice.loc=http://www.alexandriasc.com/software/JavaService/JavaService-bin-1.2.0.zip
-+
-+
-+# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
-+jdbc20ext.home=${java.base.path}/jdbc-optional
-+jdbc20ext.lib=${jdbc20ext.home}
-+jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar
-+
-+
-+# ----- Java Management Extensions (JMX), JMX RI 1.0.1 or later or MX4J 1.1
or later -----
-+jmx.home=${java.base.path}/mx4j
-+jmx.lib=${jmx.home}
-+jmx.jar=${jmx.lib}/mx4j-jmx.jar
-+jmx.loc=http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz
-+
-+
-+# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
-+jsse.home=/Library/Java/Home
-+jsse.lib=${jsse.home}/lib
-+jcert.jar=${jsse.lib}/jcert.jar
-+jnet.jar=${jsse.lib}/jnet.jar
-+jsse.jar=${jsse.lib}/jsse.jar
-+
-+
-+# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-+jta.home=${java.base.path}/jta-spec
-+jta.lib=${jta.home}
-+jta.jar=${jta.lib}/jta-spec1_0_1.jar
-+
-+
-+# ----- JUnit Unit Test Suite, version 3.7 or later -----
-+junit.home=${java.base.path}/junit
-+junit.lib=${junit.home}
-+junit.jar=${junit.lib}/junit.jar
-+junit.loc=http://download.sourceforge.net/junit/junit3.7.zip
-+
-+
-+# ----- Java Mail, version 1.2 or later -----
-+mail.home=${java.base.path}/javamail
-+mail.lib=${mail.home}
-+mail.jar=${mail.lib}/mail.jar
-+
-+
-+# ----- NSIS, version 1.9x -----
-+nsis.home=${base.path}/nsis
-+nsis.loc=http://www.nullsoft.com/free/nsis/nsis198.exe
-+
-+
-+# ----- PureTLS Extension, version 0.9 or later -----
-+puretls.home=${base.path}/puretls-0.9b2
-+puretls.lib=${puretls.home}/build
-+puretls.jar=${puretls.lib}/puretls.jar
-+
-+
-+# ----- Struts, version 1.0.1 or later -----
-+struts.home=${java.base.path}/struts
-+struts.lib=${struts.home}
-+struts.jar=${struts.lib}/struts.jar
-+struts.loc=http://jakarta.apache.org/builds/jakarta-struts/release/v1.0.2/jakarta-struts-1.0.2.tar.gz
-+
-+
-+# ----- Tyrex Data Source, version 1.0 -----
-+tyrex.home=${java.base.path}/tyrex
-+tyrex.lib=${tyrex.home}
-+tyrex.jar=${tyrex.lib}/tyrex-1.0.jar
-+tyrex.loc=ftp://ftp.exolab.org/pub/tyrex/tyrex-1.0/tyrex-1.0.jar
-+
-+
-diff -uNr jakarta-tomcat-4.1.30-src/build.sh
jakarta-tomcat-4.1.30-src-new/build.sh
---- jakarta-tomcat-4.1.30-src/build.sh 1969-12-31 19:00:00.000000000 -0500
-+++ jakarta-tomcat-4.1.30-src-new/build.sh 2004-07-18 17:19:35.000000000
-0400
-@@ -0,0 +1,7 @@
-+#!/bin/sh
-+
-+for i in @PREFIX@/etc/profile.d/*.sh; do
-+ source $i
-+done
-+
-+ant dist
-diff -uNr jakarta-tomcat-4.1.30-src/build.xml
jakarta-tomcat-4.1.30-src-new/build.xml
---- jakarta-tomcat-4.1.30-src/build.xml 2004-01-25 08:23:34.000000000
-0500
-+++ jakarta-tomcat-4.1.30-src-new/build.xml 2004-07-18 17:19:35.000000000
-0400
-@@ -18,7 +18,7 @@
- <property name="jtc.project" value="jakarta-tomcat-connectors" />
- <property name="jtc.final.name" value="${jtc.project}-${version}" />
- <property name="jtc.final-src.name"
value="${jtc.project}-${version}-src" />
-- <property name="servlet.doc" value="${servlet.home}/docs/api" />
-+ <property name="servlet.doc"
value="${base.path}/share/doc/jakarta-servletapi/api" />
-
- <!-- Build Defaults -->
- <property name="catalina.build" value="${basedir}/catalina/build"/>
-diff -uNr jakarta-tomcat-4.1.30-src/catalina/build.xml
jakarta-tomcat-4.1.30-src-new/catalina/build.xml
---- jakarta-tomcat-4.1.30-src/catalina/build.xml 2004-01-25
08:23:34.000000000 -0500
-+++ jakarta-tomcat-4.1.30-src-new/catalina/build.xml 2004-07-18
19:41:59.000000000 -0400
-@@ -696,7 +696,7 @@
- <copy todir="${catalina.build}/server/lib" file="${jaas.jar}"/>
- </target>
- <target name="copy-jdbc20ext.jar" if="copy.jdbc20ext.jar">
-- <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
-+ <!-- <copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
-->
- </target>
- <target name="copy-jmx.jar" if="copy.jmx.jar">
- <copy todir="${catalina.build}/server/lib" file="${jmx.jar}"/>
-diff -uNr jakarta-tomcat-4.1.30-src/tomcat jakarta-tomcat-4.1.30-src-new/tomcat
---- jakarta-tomcat-4.1.30-src/tomcat 1969-12-31 19:00:00.000000000 -0500
-+++ jakarta-tomcat-4.1.30-src-new/tomcat 2004-07-18 17:19:35.000000000
-0400
-@@ -0,0 +1,52 @@
+diff -uNr jakarta-tomcat-4.1.31/tomcat jakarta-tomcat-4.1.31-new/tomcat
+--- jakarta-tomcat-4.1.31/tomcat 1969-12-31 19:00:00.000000000 -0500
++++ jakarta-tomcat-4.1.31-new/tomcat 2006-06-29 21:36:20.000000000 -0400
+@@ -0,0 +1,58 @@
+#!/bin/sh
+# wrapper script for tomcat startup
+
-+for file in @PREFIX@/etc/tomcat/*.conf; do source "$file"; done
++if [ `id -u -n` != 'tomcat' ]; then
++ chown -R tomcat:tomcat @PREFIX@/var/tomcat5/logs >/dev/null 2>&1 || :
++ sudo -u tomcat $0 "$@"
++ exit $?
++fi
++
++for file in @PREFIX@/etc/tomcat5/*.conf; do source "$file"; done
+
+chown -R tomcat:tomcat "$CATALINA_HOME"/work "$CATALINA_HOME"/logs >/dev/null
2>&1
+
+tcproccount() {
-+ ps -auxwww | grep TOMCATLAUNCH | grep -v grep | wc -l
++ ps -auxwww | grep TOMCAT5LAUNCH | grep -v grep | wc -l
+}
+
+case "$1" in
+ start)
+ echo -n "Starting Tomcat: "
-+ $CATALINA_HOME/bin/catalina.sh start
>>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
++ $CATALINA_HOME/bin/catalina.sh start
>>@PREFIX@/var/tomcat5/logs/tomcat.log 2>&1
+ echo "ok"
+ ;;
+
+ stop)
-+ $CATALINA_HOME/bin/catalina.sh stop
>>@PREFIX@/var/tomcat4/logs/tomcat.log 2>&1
++ $CATALINA_HOME/bin/catalina.sh stop
>>@PREFIX@/var/tomcat5/logs/tomcat.log 2>&1
+ ;;
+
+ restart)
@@ -328,42 +60,18 @@
+ ;;
+
+esac
-diff -uNr jakarta-tomcat-4.1.30-src/tomcat.conf
jakarta-tomcat-4.1.30-src-new/tomcat.conf
---- jakarta-tomcat-4.1.30-src/tomcat.conf 1969-12-31 19:00:00.000000000
-0500
-+++ jakarta-tomcat-4.1.30-src-new/tomcat.conf 2004-07-18 17:19:35.000000000
-0400
+diff -uNr jakarta-tomcat-4.1.31/tomcat.conf
jakarta-tomcat-4.1.31-new/tomcat.conf
+--- jakarta-tomcat-4.1.31/tomcat.conf 1969-12-31 19:00:00.000000000 -0500
++++ jakarta-tomcat-4.1.31-new/tomcat.conf 2006-06-29 21:36:20.000000000
-0400
@@ -0,0 +1,11 @@
+# location of your JDK
+JAVA_HOME=/Library/Java/Home export JAVA_HOME
+JSSE_HOME=$JAVA_HOME/lib/ext export JSSE_HOME
+
+# location of Tomcat
[EMAIL PROTECTED]@/var/tomcat4 export CATALINA_HOME
[EMAIL PROTECTED]@/var/tomcat5 export CATALINA_HOME
+
+# any extra options to pass to tomcat startup
-+# feel free to add to this, but please don't remove the TOMCATLAUNCH,
++# feel free to add to this, but please don't remove the TOMCAT5LAUNCH,
+# it is used for finding tomcat processes
-+CATALINA_OPTS="-DTOMCATLAUNCH=true" export CATALINA_OPTS
-diff -uNr jakarta-tomcat-4.1.30-src/webapps/admin/admin.xml
jakarta-tomcat-4.1.30-src-new/webapps/admin/admin.xml
---- jakarta-tomcat-4.1.30-src/webapps/admin/admin.xml 2004-01-25
08:23:48.000000000 -0500
-+++ jakarta-tomcat-4.1.30-src-new/webapps/admin/admin.xml 2004-07-18
17:19:35.000000000 -0400
-@@ -7,7 +7,7 @@
- -->
-
-
--<Context path="/admin" docBase="../server/webapps/admin"
-+<Context path="/admin" docBase="@PREFIX@/var/tomcat4/server/webapps/admin"
- debug="0" privileged="true">
-
- <!-- Uncomment this Valve to limit access to the Admin app to localhost
-diff -uNr jakarta-tomcat-4.1.30-src/webapps/manager/manager.xml
jakarta-tomcat-4.1.30-src-new/webapps/manager/manager.xml
---- jakarta-tomcat-4.1.30-src/webapps/manager/manager.xml 2004-01-25
08:23:48.000000000 -0500
-+++ jakarta-tomcat-4.1.30-src-new/webapps/manager/manager.xml 2004-07-18
17:19:36.000000000 -0400
-@@ -7,7 +7,7 @@
- -->
-
-
--<Context path="/manager" docBase="../server/webapps/manager"
-+<Context path="/manager" docBase="@PREFIX@/var/tomcat4/server/webapps/manager"
- debug="0" privileged="true">
-
- <!-- Link to the user database we will get roles from -->
++CATALINA_OPTS="-DTOMCAT5LAUNCH=true" export CATALINA_OPTS
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
