svn commit: r666166 - in /geronimo/server/branches/2.1/plugins/tomcat: geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java tomcat6/src/main/plan/plan.xml

[ga...@apache.org]

Author: gawor
Date: Tue Jun 10 08:47:02 2008
New Revision: 666166

URL: http://svn.apache.org/viewvc?rev=666166&view=rev
Log:
register AprLifecycleListener to initialize the APR library (GERONIMO-4103)

Added:
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java   (with props)
Modified:
    geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml

Added: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java?rev=666166&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java (added)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java Tue Jun 10 08:47:02 2008
@@ -0,0 +1,46 @@
+/**
+ *  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.
+ */
+package org.apache.geronimo.tomcat.listener;
+
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.core.AprLifecycleListener;
+
+/*
+ * GeronimoAprLifecycleListener translates START_EVENT to INIT_EVENT
+ * and STOP_EVENT to AFTER_STOP_EVENT for the AprLifecycleListener
+ * so that the APR library is initialized correctly. The translation is
+ * necessary as the INIT_EVENT and STOP_EVENT event are generated by Tomcat's 
+ * StandardServer which is not present in this Tomcat integration code.
+ */
+public class GeronimoAprLifecycleListener extends AprLifecycleListener {
+
+    @Override
+    public void lifecycleEvent(LifecycleEvent event) {             
+        if (Lifecycle.START_EVENT.equals(event.getType())) {
+            event = new LifecycleEvent(event.getLifecycle(), 
+                                       Lifecycle.INIT_EVENT,
+                                       event.getData());
+        } else if (Lifecycle.STOP_EVENT.equals(event.getType())) {
+            event = new LifecycleEvent(event.getLifecycle(), 
+                                       Lifecycle.AFTER_STOP_EVENT,
+                                       event.getData());
+        }
+        
+        super.lifecycleEvent(event);
+    }
+}

Propchange: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/listener/GeronimoAprLifecycleListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=666166&r1=666165&r2=666166&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/tomcat6/src/main/plan/plan.xml Tue Jun 10 08:47:02 2008
@@ -46,6 +46,13 @@
         <reference name="WebManager">
             <name>TomcatWebManager</name>
         </reference>
+        <reference name="LifecycleListenerChain">
+            <name>AprLifecycleListener</name>
+        </reference>
+    </gbean>
+
+    <gbean name="AprLifecycleListener" class="org.apache.geronimo.tomcat.LifecycleListenerGBean">
+        <attribute name="className">org.apache.geronimo.tomcat.listener.GeronimoAprLifecycleListener</attribute>
     </gbean>
 
     <gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.Http11ConnectorGBean">