Author: struberg
Date: Tue Sep 25 19:41:14 2012
New Revision: 1390099
URL: http://svn.apache.org/viewvc?rev=1390099&view=rev
Log:
OWB-706 tomcat6 plugin now working as well
Added:
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/beans.xml
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/
- copied from r1390004,
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/
Removed:
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/test/OwbTomcatPluginIT.java
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
Modified: openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml?rev=1390099&r1=1390098&r2=1390099&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
(original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml Tue Sep
25 19:41:14 2012
@@ -134,7 +134,7 @@
<id>start-tomcat</id>
<phase>pre-integration-test</phase>
<goals>
- <goal>run-war</goal>
+ <goal>run</goal>
</goals>
</execution>
<execution>
Added:
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/beans.xml?rev=1390099&view=auto
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/beans.xml
(added)
+++
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/resources/META-INF/beans.xml
Tue Sep 25 19:41:14 2012
@@ -0,0 +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.
+-->
+<beans/>
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/test/OwbTomcatPluginIT.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/test/OwbTomcatPluginIT.java?rev=1390099&r1=1390004&r2=1390099&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/test/OwbTomcatPluginIT.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat6/test/OwbTomcatPluginIT.java
Tue Sep 25 19:41:14 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.web.tomcat7.test;
+package org.apache.webbeans.web.tomcat6.test;
import org.apache.http.HttpResponse;
Modified:
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java?rev=1390099&r1=1390098&r2=1390099&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ContextLifecycleListener.java
Tue Sep 25 19:41:14 2012
@@ -104,6 +104,8 @@ public class ContextLifecycleListener im
}
context.addApplicationListener(TomcatSecurityListener.class.getName());
+ context.addContainerListener(this);
+
//context.addInstanceListener(TomcatInstanceListener.class.getName());
}
}
