svn commit: r1389863 - in /openwebbeans/trunk/webbeans-tomcat7: pom.xml src/it/servletinjection/src/main/webapp/META-INF/context.xml src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java

[struberg]

Author: struberg
Date: Tue Sep 25 13:51:34 2012
New Revision: 1389863

URL: http://svn.apache.org/viewvc?rev=1389863&view=rev
Log:
OWB-705 minor cleanup

Modified:
    openwebbeans/trunk/webbeans-tomcat7/pom.xml
    
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
    
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java

Modified: openwebbeans/trunk/webbeans-tomcat7/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/pom.xml?rev=1389863&r1=1389862&r2=1389863&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat7/pom.xml Tue Sep 25 13:51:34 2012
@@ -29,13 +29,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.2.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
             <version>7.0.0</version>
@@ -43,12 +36,22 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-spi</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-impl</artifactId>
@@ -59,19 +62,6 @@
             <artifactId>openwebbeans-web</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
     </dependencies>
 
 

Modified: 
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml?rev=1389863&r1=1389862&r2=1389863&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
 (original)
+++ 
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
 Tue Sep 25 13:51:34 2012
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one or more

Modified: 
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java?rev=1389863&r1=1389862&r2=1389863&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
 (original)
+++ 
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
 Tue Sep 25 13:51:34 2012
@@ -50,6 +50,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
+
 /**
  * Context lifecycle listener. Adapted from
  * OpenEJB Tomcat and updated.
@@ -81,6 +82,7 @@ public class ContextLifecycleListener im
             else if (event.getSource() instanceof StandardContext)
             {
                 StandardContext context = (StandardContext) event.getSource();
+
                 if (event.getType().equals(Lifecycle.CONFIGURE_START_EVENT))
                 {
                     ServletContext scontext = context.getServletContext();
@@ -95,7 +97,6 @@ public class ContextLifecycleListener im
 
                         
listeners.addFirst(WebBeansConfigurationListener.class.getName());
 
-
                         for(String listener : oldListeners)
                         {
                             listeners.add(listener);
@@ -138,6 +139,7 @@ public class ContextLifecycleListener im
             if(event.getSource() instanceof StandardContext)
             {               
                 context = (StandardContext)event.getSource();
+
                 if(event.getType().equals("beforeContextInitialized"))
                 {
                     ClassLoader loader = context.getLoader().getClassLoader();