[mapguide-commits] r4841 - sandbox/adsk/2.1/Oem/LinuxApt

[svn_mapguide at osgeo.org]

Author: brucedechant
Date: 2010-05-05 18:56:51 -0400 (Wed, 05 May 2010)
New Revision: 4841

Added:
   sandbox/adsk/2.1/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
Removed:
   sandbox/adsk/2.1/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
Modified:
   sandbox/adsk/2.1/Oem/LinuxApt/build_apt.sh
   sandbox/adsk/2.1/Oem/LinuxApt/server.xml
Log:
Upgrade to Tomcat 6.0.24

- Added Tomcat 6.0.24
- Removed Tomcat 6.0.14
- Restored change to server.xml file. ie: Added Java memory leak fix back
- Updated build script

Deleted: sandbox/adsk/2.1/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
===================================================================
(Binary files differ)

Added: sandbox/adsk/2.1/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
===================================================================
(Binary files differ)


Property changes on: sandbox/adsk/2.1/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: sandbox/adsk/2.1/Oem/LinuxApt/build_apt.sh
===================================================================
--- sandbox/adsk/2.1/Oem/LinuxApt/build_apt.sh	2010-05-05 15:01:25 UTC (rev 4840)
+++ sandbox/adsk/2.1/Oem/LinuxApt/build_apt.sh	2010-05-05 22:56:51 UTC (rev 4841)
@@ -230,10 +230,10 @@
 #**********************************************************
 if [ "$TOMCAT" = "1" ]; then
 echo Tomcat install started
-tar -zxf apache-tomcat-6.0.14.tar.gz -C $INSTALLWEB
+tar -zxf apache-tomcat-6.0.24.tar.gz -C $INSTALLWEB
 check_tomcat_install
 pushd $INSTALLWEB
-mv apache-tomcat-6.0.14 tomcat
+mv apache-tomcat-6.0.24 tomcat
 check_tomcat_install
 popd
 echo Tomcat install completed

Modified: sandbox/adsk/2.1/Oem/LinuxApt/server.xml
===================================================================
--- sandbox/adsk/2.1/Oem/LinuxApt/server.xml	2010-05-05 15:01:25 UTC (rev 4840)
+++ sandbox/adsk/2.1/Oem/LinuxApt/server.xml	2010-05-05 22:56:51 UTC (rev 4841)
@@ -1,3 +1,20 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!-- Note:  A "Server" is not itself a "Container", so you may not
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
@@ -8,6 +25,8 @@
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
   <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
   <Listener className="org.apache.catalina.core.JasperListener" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
   <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
@@ -78,7 +97,7 @@
          Documentation at /docs/config/engine.html -->
 
     <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">         
     --> 
     <Engine name="Catalina" defaultHost="localhost">