Changeset 54508


Ignore:
Timestamp:
Jul 28, 2009, 10:22:00 PM (9 years ago)
Author:
jberry@…
Message:

Cleanups to tomcat6, including fixing the name of the pid file used, to prevent a tug of war with daemondo and launchctl over this issue.

Location:
trunk/dports/java/tomcat6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/tomcat6/Portfile

    r45135 r54508  
    55name                            tomcat6
    66version                         6.0.18
     7revision                        1
    78
    89categories                      java www
     
    5253                                        port:saxpath
    5354                               
    54 ## worksrcdir                   ${distname}
    55 
    5655set javaLibs            ${prefix}/share/java
    5756set home                        share/java/tomcat6
     
    9392build.args                      $antArgs
    9493
    95 ## # Remove compatibility for pre-JRE 1.5 systems
    96 ## variant nocompat {
    97 ##      build.target-delete compat
    98 ## }
    99 
    10094pre-build {
    10195        #
     
    134128        # Install Tomcat
    135129        ui_msg "# installing tomcat..."
    136 ##      file copy ${worksrcpath}/bin/ ${destroot}/${prefix}/bin
    137 ##      file copy ${worksrcpath}/bin ${target}
    138 ##      system "cd ${worksrcpath} &&  ant $antArgs deploy"
    139         system "cd ${worksrcpath} &&  ant $antArgs deploy"
     130        system "cd ${worksrcpath} && ant $antArgs deploy"
    140131        ## build space:
    141132        file copy ${worksrcpath}/output/build/bin ${target}
     
    146137        ## and classes:
    147138        file copy ${worksrcpath}/output/classes ${target}/shared/
    148        
    149 ##      # Add compat files as needed
    150 ##      if { ! [variant_isset nocompat] } {
    151 ##              system "tar -cf - -C ${worksrcpath}/compat . | tar xpf - -C ${target}"
    152 ##      }
    153139       
    154140        # Add the jstl libs to tomcat6/shared/lib so that they're available to all
     
    186172                ${target}/conf
    187173       
    188         # Don't install startup script, as we're now generating a startupitem
    189         #xinstall -m 755 ${filespath}/tomcat6.sh \
    190         #       ${destroot}${prefix}/etc/rc.d
    191         #reinplace s|TOMCATPREFIX=$|TOMCATPREFIX=${prefix}/${home}| ${destroot}${prefix}/etc/rc.d/tomcat6.sh
    192                
    193174        # Add a symlink from bin directory to tomcatctl
    194175        system "cd ${destroot}${prefix}/bin && ln -s ../${home}/bin/tomcatctl"
     
    242223        ui_msg "# Under Apple Java, control over the Java version used to launch ${name} is"
    243224        ui_msg "# through the shell variable JAVA_JVM_VERSION. This variable should be set"
    244         ui_msg "# to a java version such as 1.4, 1.5, or CurrentJDK (for the default version)."
     225        ui_msg "# to a java version such as 1.5, 1.6, or CurrentJDK (for the default version)."
    245226        ui_msg "# You may set JAVA_JVM_VERSION in ${prefix}/${home}/bin/setenv.sh."
    246227        ui_msg "#"
  • trunk/dports/java/tomcat6/files/setenv.sh

    r45135 r54508  
    2323        if [ `uname -s` = "Darwin" ]; then
    2424       
    25                 # To specify that a particular Java version be run, set it here
    26                 #export JAVA_JVM_VERSION=1.5
    27        
    2825                # Look for a java version specified by JAVA_JVM_VERSION, falling back to current version
    2926                # Set JAVA_HOME to reflect the version
  • trunk/dports/java/tomcat6/files/tomcat6.sh

    r45135 r54508  
    55case "$1" in
    66start)
    7         [ -x ${TOMCATCTL} ] && ${TOMCATCTL} start > /dev/null && echo -n ' tomcat5'
     7        [ -x ${TOMCATCTL} ] && ${TOMCATCTL} start > /dev/null && echo -n ' tomcat6'
    88        ;;
    99stop)
    10         [ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop > /dev/null && echo -n ' tomcat5'
     10        [ -x ${TOMCATCTL} ] && ${TOMCATCTL} stop > /dev/null && echo -n ' tomcat6'
    1111        ;;
    1212*)
  • trunk/dports/java/tomcat6/files/tomcatctl

    r45135 r54508  
    5151[ -z "$CATALINA_TMPDIR" ]       && CATALINA_TMPDIR="${CATALINA_BASE}/temp"
    5252
    53 [ -z "$TOMCAT_PIDNAME" ]        && TOMCAT_PIDNAME="tomcat5.pid"
     53[ -z "$TOMCAT_PIDNAME" ]        && TOMCAT_PIDNAME="tomcat6.pid"
    5454[ -z "$TOMCAT_PIDFILE" ]        && TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
    5555[ -z "$TOMCAT_USER" ]           && TOMCAT_USER=tomcat
Note: See TracChangeset for help on using the changeset viewer.