Attachment 37807 Details for Bug 60036 – file.diff

[patch] file.diff

file.diff (text/plain), 8.44 KB, created by Kang Liu on 2003-12-08 03:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kang Liu

Created: 2003-12-08 03:50:09 UTC

Size: 8.44 KB

patch

obsolete

>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat5/distinfo,v
>retrieving revision 1.4
>diff -u -r1.4 distinfo
>--- distinfo	20 Nov 2003 19:59:02 -0000	1.4
>+++ distinfo	8 Dec 2003 02:30:27 -0000
>@@ -1 +1 @@
>-MD5 (jakarta-tomcat-5.0.14.tar.gz) = d92fd86da7ae159392ac222930619f4f
>+MD5 (jakarta-tomcat-5.0.16.tar.gz) = 8297bc97fb7c42f870069503bfddcb7d
>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat5/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- Makefile	20 Nov 2003 19:59:02 -0000	1.6
>+++ Makefile	8 Dec 2003 02:30:27 -0000
>@@ -6,16 +6,16 @@
> #
> 
> PORTNAME=	jakarta-tomcat
>-PORTVERSION=	5.0.14
>+PORTVERSION=	5.0.16
> CATEGORIES=	www java
>-MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}-beta/bin/ \
>-		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v{PORTVERSION}-beta/bin/ \
>+MASTER_SITES=	http://www.apache.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
>+		http://apache.lemon4ssc.org/dist/jakarta/tomcat-5/v${PORTVERSION}/bin/ \
> 		http://distfiles.coredump.cn/
> 
> MAINTAINER=	liukang@bjpu.edu.cn
> COMMENT=	Open-source Java web server by Apache, 5.0.x branch
> 
>-USE_JAVA=	1.4+
>+USE_JAVA=	1.2+
> NO_BUILD=	YES
> 
> MAJOR_VER=	${PORTVERSION:R}
>@@ -171,5 +171,4 @@
> .if ${AUTO_START} == "YES"
> 	@${CONTROL_SCRIPT} start || true
> .endif
>-	@${ECHO_CMD} "Using Tomcat 5.x in a production environment is NOT recommended!"
> .include <bsd.port.post.mk>
>Index: pkg-descr
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat5/pkg-descr,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-descr
>--- pkg-descr	13 Aug 2003 11:39:38 -0000	1.1
>+++ pkg-descr	8 Dec 2003 03:35:14 -0000
>@@ -1,13 +1,13 @@
> Jakarta Tomcat is a web server written in 100% Pure Java.
> 
>-Tomcat 5.x is the upcoming major release of Tomcat,
>+Tomcat 5.x is the current release of Tomcat,
> and builds upon the Tomcat 3.3 and Tomcat 4.1 codebases.
> The 5.x releases implement the Servlet 2.4 and JSP 2.0 specifications.
> 
> Tomcat 5.0.x. Tomcat 5.0 improves on Tomcat 4.1 in many ways, including:
> 
> o Performance optimizations and reduced garbage collection
>-o Refactored application deployer, 
>+o Refactored application deployer,
>   with an optional standalone deployer allowing validation
>   and compilation of a web application before putting it in production
> o Complete server monitoring using JMX and the manager web application
>@@ -15,9 +15,8 @@
> o Improved Taglibs handling, including advanced pooling and tag plugins
> o Improved platform integration, with native Windows and Unix wrappers
> o Embedding of Tomcat using JMX
>+o Enhanced Security Manager support
>+o Integrated session clustering
> o Expanded documentation
>-
>-ATTENTION: Tomcat 5.x is still under development, 
>-           DO NOT use it in production environment.
> 
> WWW: http://jakarta.apache.org/tomcat/
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/www/jakarta-tomcat5/pkg-plist,v
>retrieving revision 1.5
>diff -u -r1.5 pkg-plist
>--- pkg-plist	20 Nov 2003 19:59:02 -0000	1.5
>+++ pkg-plist	8 Dec 2003 02:30:35 -0000
>@@ -29,9 +29,9 @@
> %%T%%/common/lib/commons-pool-1.1.jar
> %%T%%/common/lib/jasper-compiler.jar
> %%T%%/common/lib/jasper-runtime.jar
>-%%T%%/common/lib/jmx.jar
>-%%T%%/common/lib/jmx-remote.jar
> %%T%%/common/lib/jmx-remote-tools.jar
>+%%T%%/common/lib/jmx-remote.jar
>+%%T%%/common/lib/jmx.jar
> %%T%%/common/lib/jsp-api.jar
> %%T%%/common/lib/naming-common.jar
> %%T%%/common/lib/naming-factory.jar
>@@ -40,6 +40,7 @@
> %%T%%/common/lib/servlet-api.jar
> %%T%%/common/lib/tools.jar
> %%T%%/conf/Catalina/localhost/admin.xml
>+%%T%%/conf/Catalina/localhost/balancer.xml
> %%T%%/conf/Catalina/localhost/manager.xml
> %%T%%/conf/catalina.policy
> %%T%%/conf/catalina.properties
>@@ -164,11 +165,16 @@
> @exec mkdir %D/%%T%%/temp || true
> %%T%%/webapps/ROOT/RELEASE-NOTES.txt
> %%T%%/webapps/ROOT/WEB-INF/classes/org/apache/jsp/index_jsp.class
>+%%T%%/webapps/ROOT/WEB-INF/lib/catalina-root.jar
> %%T%%/webapps/ROOT/WEB-INF/web.xml
> %%T%%/webapps/ROOT/index.jsp
> %%T%%/webapps/ROOT/jakarta-banner.gif
> %%T%%/webapps/ROOT/tomcat-power.gif
> %%T%%/webapps/ROOT/tomcat.gif
>+%%T%%/webapps/balancer/WEB-INF/config/rules.xml
>+%%T%%/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
>+%%T%%/webapps/balancer/WEB-INF/web.xml
>+%%T%%/webapps/balancer/balancer.xml
> %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.class
> %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entries.java
> %%T%%/webapps/jsp-examples/WEB-INF/classes/cal/Entry.class
>@@ -515,6 +521,7 @@
> %%T%%/webapps/tomcat-docs/appdev/sample/web/index.html
> %%T%%/webapps/tomcat-docs/appdev/source.html
> %%T%%/webapps/tomcat-docs/appdev/web.xml.txt
>+%%T%%/webapps/tomcat-docs/balancer-howto.html
> %%T%%/webapps/tomcat-docs/build.xml
> %%T%%/webapps/tomcat-docs/building.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/allclasses-frame.html
>@@ -810,6 +817,7 @@
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextConfig.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextRuleSet.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CopyParentClassLoaderRule.html
>+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/DigesterFactory.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Embedded.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineConfig.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineRuleSet.html
>@@ -821,7 +829,6 @@
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/NamingRuleSet.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/PasswdUserDatabase.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetAllPropertiesRule.html
>-%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetAllPropertiesRule.SystemPropertyPropertyResource.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetDocBaseRule.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldConfig.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldRuleSet.html
>@@ -846,6 +853,7 @@
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-tree.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Base64.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CGIProcessEnvironment.html
>+%%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CatalinaDigester.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CharsetMapper.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CookieTools.html
> %%T%%/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CustomObjectInputStream.html
>@@ -1364,6 +1372,7 @@
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapUtil.html
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagConstants.html
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagPluginManager.html
>+%%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TextOptimizer.html
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TldLocationsCache.html
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-frame.html
> %%T%%/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-summary.html
>@@ -1556,6 +1565,7 @@
> %%T%%/webapps/tomcat-docs/jspapi/stylesheet.css
> %%T%%/webapps/tomcat-docs/manager-howto.html
> %%T%%/webapps/tomcat-docs/mbeans-descriptor-howto.html
>+%%T%%/webapps/tomcat-docs/printer/balancer-howto.html
> %%T%%/webapps/tomcat-docs/printer/building.html
> %%T%%/webapps/tomcat-docs/printer/cgi-howto.html
> %%T%%/webapps/tomcat-docs/printer/changelog.html
>@@ -1893,6 +1903,12 @@
> @dirrm %%T%%/webapps/jsp-examples/WEB-INF/classes
> @dirrm %%T%%/webapps/jsp-examples/WEB-INF
> @dirrm %%T%%/webapps/jsp-examples
>+@dirrm %%T%%/webapps/balancer/images
>+@dirrm %%T%%/webapps/balancer/WEB-INF/lib
>+@dirrm %%T%%/webapps/balancer/WEB-INF/config
>+@dirrm %%T%%/webapps/balancer/WEB-INF
>+@dirrm %%T%%/webapps/balancer
>+@dirrm %%T%%/webapps/ROOT/WEB-INF/lib
> @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org/apache/jsp
> @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org/apache
> @dirrm %%T%%/webapps/ROOT/WEB-INF/classes/org

Actions: View | Diff

Attachments on bug 60036: 37807