Ignore:
Timestamp:
Jul 13, 2010, 4:04:43 PM (9 years ago)
Author:
ricci@…
Message:

upgrade to 6.0.28
refresh patches for 6.0.28

Location:
trunk/dports/java/tomcat6/files
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/tomcat6/files/patch-bin-catalina.sh

    r45135 r69689  
    1 --- bin/catalina.sh.orig        2009-01-02 11:57:54.000000000 -0800
    2 +++ bin/catalina.sh     2009-01-02 11:58:16.000000000 -0800
    3 @@ -185,6 +185,11 @@
    4    LOGGING_CONFIG="-Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
     1--- bin/catalina.sh.orig        2010-06-29 07:33:40.000000000 -0700
     2+++ bin/catalina.sh     2010-07-13 08:47:10.000000000 -0700
     3@@ -220,6 +220,11 @@
     4   JAVA_OPTS="$JAVA_OPTS $LOGGING_MANAGER"
    55 fi
    66 
  • trunk/dports/java/tomcat6/files/patch-build.xml.diff

    r45135 r69689  
    1 --- build.xml.orig      2008-07-21 17:01:29.000000000 -0700
    2 +++ build.xml   2009-01-02 17:00:38.000000000 -0800
    3 @@ -471,7 +471,7 @@
    4              file="${tomcat-native.tar.gz}" />
     1--- build.xml.orig      2010-06-29 07:33:40.000000000 -0700
     2+++ build.xml   2010-07-13 08:39:59.000000000 -0700
     3@@ -140,6 +140,7 @@
    54 
    6      <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
    7 -    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
    8 +  <!---  <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" /> -->
     5     <!-- Compile internal server components -->
     6     <javac srcdir="java" destdir="${tomcat.classes}"
     7+           fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
     8            debug="${compile.debug}"
     9            deprecation="${compile.deprecation}"
     10            source="${compile.source}"
     11@@ -531,6 +532,7 @@
    912 
    10         <!-- Copy scripts -->
    11      <copy todir="${tomcat.build}/bin">
     13     <!-- Build classes for examples webapp -->
     14     <javac   srcdir="webapps/examples/WEB-INF/classes"
     15+             fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
     16              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
     17              debug="${compile.debug}" deprecation="${compile.deprecation}"
     18              source="${compile.source}"
     19@@ -542,6 +544,7 @@
     20     </javac>
     21 
     22     <javac   srcdir="webapps/examples/jsp/plugin/applet"
     23+             fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
     24              destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
     25              debug="${compile.debug}" deprecation="${compile.deprecation}"
     26              source="${compile.source}"
     27@@ -801,6 +804,7 @@
     28     </move>
     29     <mkdir dir="${tomcat-dbcp.home}/classes"/>
     30     <javac destdir="${tomcat-dbcp.home}/classes"
     31+           fork="true" memoryinitialsize="256m" memorymaximumsize="512m"
     32            optimize="off"
     33            debug="${compile.debug}"
     34            deprecation="${compile.deprecation}"
Note: See TracChangeset for help on using the changeset viewer.