[jboss-cvs] JBossAS SVN: r96508 - in trunk/tomcat/src/main/java/org/jboss/web/tomcat: service/deployers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-11-18 14:19:48 -0500 (Wed, 18 Nov 2009)
New Revision: 96508

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/metadata/ContextMetaData.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Implement wrapper notifications fixme.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/metadata/ContextMetaData.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/metadata/ContextMetaData.java	2009-11-18 19:13:11 UTC (rev 96507)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/metadata/ContextMetaData.java	2009-11-18 19:19:48 UTC (rev 96508)
@@ -46,8 +46,8 @@
    private List<ParameterMetaData> parameters;
    private ResourcesMetaData resources;
    private SessionCookieMetaData sessionCookie;
-   // FIXME: no support for the naming elements (which might be the right thing to do)
-   // FIXME: no WatchedResource, WrapperLifecycle, WrapperListener
+   private List<String> wrapperLifecycles;
+   private List<String> wrapperListeners;
    
    public String getName()
    {
@@ -169,4 +169,24 @@
       this.sessionCookie = sessionCookie;
    }
    
+   public List<String> getWrapperLifecycles()
+   {
+      return wrapperLifecycles;
+   }
+   @XmlElement(name = "WrapperLifecycle")
+   public void setWrapperLifecycles(List<String> wrapperLifecycles)
+   {
+      this.wrapperLifecycles = wrapperLifecycles;
+   }
+
+   public List<String> getWrapperListeners()
+   {
+      return wrapperListeners;
+   }
+   @XmlElement(name = "WrapperListener")
+   public void setWrapperListeners(List<String> wrapperListeners)
+   {
+      this.wrapperListeners = wrapperListeners;
+   }
+   
 }

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-11-18 19:13:11 UTC (rev 96507)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-11-18 19:19:48 UTC (rev 96508)
@@ -833,6 +833,26 @@
                context.setSessionCookie(sessionCookie);
             }
 
+            // Context/WrapperLifecycle
+            if (contextMetaData.getWrapperLifecycles() != null)
+            {
+               Iterator<String> listeners = contextMetaData.getWrapperLifecycles().iterator();
+               while (listeners.hasNext())
+               {
+                  context.addWrapperLifecycle(listeners.next());
+               }
+            }
+
+            // Context/WrapperListeners
+            if (contextMetaData.getWrapperListeners() != null)
+            {
+               Iterator<String> listeners = contextMetaData.getWrapperListeners().iterator();
+               while (listeners.hasNext())
+               {
+                  context.addWrapperListener(listeners.next());
+               }
+            }
+
          }
          catch (Exception e)
          {