openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1615887 - in /openwebbeans/branches/owb_1.2.x: ./ samples/tomcat-sample/src/main/webapp/META-INF/ samples/tomcat7-sample/ samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/ samples/tomcat7-sample/src/main/tomcat/ samp...
Date Tue, 05 Aug 2014 08:25:02 GMT
Author: struberg
Date: Tue Aug  5 08:25:01 2014
New Revision: 1615887

URL: http://svn.apache.org/r1615887
Log:
OWB-983 fix tomcat7 integration

* implement Principal mechanism as Filter instead of a listener
* heavily simplify the Lifecycle and InstanceManager registration

Added:
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/tomcat/
      - copied from r1615884, openwebbeans/trunk/samples/tomcat7-sample/src/main/tomcat/
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/index.jsp
      - copied unchanged from r1615884, openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/index.jsp
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/
      - copied from r1615884, openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/
      - copied from r1615884, openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/
      - copied from r1615884, openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/openwebbeans/
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml
      - copied unchanged from r1615884, openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/web-fragment.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/
      - copied from r1615884, openwebbeans/trunk/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7/
Removed:
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/lib/
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat/
Modified:
    openwebbeans/branches/owb_1.2.x/   (props changed)
    openwebbeans/branches/owb_1.2.x/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/META-INF/context.xml
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/pom.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin

Propchange: openwebbeans/branches/owb_1.2.x/
------------------------------------------------------------------------------
  Merged /openwebbeans/trunk:r1615884

Modified: openwebbeans/branches/owb_1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/pom.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/pom.xml Tue Aug  5 08:25:01 2014
@@ -77,6 +77,8 @@
         <geronimo_atinject.version>1.0</geronimo_atinject.version>
         <geronimo_interceptor.version>1.0</geronimo_interceptor.version>
         <geronimo_validation.version>1.1</geronimo_validation.version>
+        <tomcat6.version>6.0.35</tomcat6.version>
+        <tomcat7.version>7.0.54</tomcat7.version>
         <openejb.version>3.1.4</openejb.version>
         <myfaces.version>1.2.9</myfaces.version>
         <myfaces2.version>2.2.3</myfaces2.version>

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/META-INF/context.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/META-INF/context.xml
(original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/META-INF/context.xml
Tue Aug  5 08:25:01 2014
@@ -15,5 +15,5 @@
     License.
 -->
 <Context>
-    <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
+    <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" />
 </Context>

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/pom.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/pom.xml Tue Aug  5 08:25:01 2014
@@ -20,8 +20,8 @@ under the License.
     <modelVersion>4.0.0</modelVersion>
     <description>Sample Tomcat7 Application</description>
     <parent>
-        <artifactId>samples</artifactId>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>samples</artifactId>
         <version>1.2.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -38,28 +38,12 @@ under the License.
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-ee-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -72,32 +56,146 @@ under the License.
             <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-resource</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
     </dependencies>
 
     <build>
         <finalName>tomcat-sample</finalName>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tomcat-maven-plugin</artifactId>
-                <version>1.1</version>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
                 <configuration>
-                    <url>http://localhost:8080/manager/text</url>
+                    <tomcatUsers>${project.basedir}/src/main/tomcat/tomcat-users.xml</tomcatUsers>
+                    <contextFile>${project.basedir}/src/main/tomcat/context.xml</contextFile>
                 </configuration>
+                <dependencies>
+                    <!-- just to be able to define the tomcat version -->
+                    <dependency>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-core</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-util</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-coyote</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-api</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jdbc</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-dbcp</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-servlet-api</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jsp-api</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jasper</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jasper-el</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-el-api</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-catalina</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-tribes</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-catalina-ha</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-annotations-api</artifactId>
+                        <version>${tomcat7.version}</version>
+                    </dependency>
+
+                    <!-- OWB deps -->
+                    <dependency>
+                        <groupId>org.apache.openwebbeans</groupId>
+                        <artifactId>openwebbeans-impl</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.openwebbeans</groupId>
+                        <artifactId>openwebbeans-spi</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.openwebbeans</groupId>
+                        <artifactId>openwebbeans-web</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.openwebbeans</groupId>
+                        <artifactId>openwebbeans-tomcat7</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+                        <version>${geronimo_cdi.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                        <version>${geronimo_atinject.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+                        <version>${geronimo_interceptor.version}</version>
+                    </dependency>
+
+                </dependencies>
             </plugin>
         </plugins>
     </build>

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
(original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
Tue Aug  5 08:25:01 2014
@@ -19,8 +19,8 @@
 package org.apache.webbeans.samples.tomcat;
 
 import java.io.IOException;
-import java.lang.annotation.Annotation;
 import java.util.Set;
+import java.util.logging.Logger;
 
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
@@ -32,29 +32,30 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.webbeans.annotation.DefaultLiteral;
 
 public class MyFilter implements Filter
 {
+    private static final Logger log = Logger.getLogger(MyFilter.class.getName());
+
     private @Inject BeanManager manager;
 
+
     @Override
     public void destroy()
     {
-        
-        
+
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws
IOException, ServletException
     {
-        Set<Bean<?>> beans = manager.getBeans(CurrentDateProvider.class, new
Annotation[]{new DefaultLiteral()});
-        System.out.println("Total found beans : " + beans.size());
+        Set<Bean<?>> beans = manager.getBeans(CurrentDateProvider.class);
+        log.info("Total found beans : " + beans.size());
         Bean<CurrentDateProvider> provider = (Bean<CurrentDateProvider>)beans.iterator().next();
         CurrentDateProvider instance = (CurrentDateProvider) manager.getReference(provider,
CurrentDateProvider.class, manager.createCreationalContext(provider));
         
-        System.out.println("Current time is : " + instance.getCurrentDate());
+        log.info("Current time is : " + instance.getCurrentDate());
         
         arg2.doFilter(arg0, arg1);
         

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
(original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
Tue Aug  5 08:25:01 2014
@@ -16,39 +16,44 @@
     License.
 -->
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <filter>
-  <filter-name>injectorfilter</filter-name>
-  <filter-class>org.apache.webbeans.samples.tomcat.MyFilter</filter-class>
- </filter>
- <filter-mapping>
-  <filter-name>injectorfilter</filter-name>
-  <servlet-name>injector</servlet-name>
-  <dispatcher>REQUEST</dispatcher>
- </filter-mapping>
- <servlet>
-  <servlet-name>injector</servlet-name>
-  <servlet-class>org.apache.webbeans.samples.tomcat.InjectorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
-  <servlet-name>injector</servlet-name>
-  <url-pattern>/injector</url-pattern>
- </servlet-mapping>
- <security-constraint>
-  <display-name>injector</display-name>
-  <web-resource-collection>
-   <web-resource-name>injector</web-resource-name>
-   <url-pattern>/injector/*</url-pattern>
-  </web-resource-collection>
-  <auth-constraint>
-   <role-name>manager-script</role-name>
-  </auth-constraint>
- </security-constraint>
- <login-config>
-  <auth-method>BASIC</auth-method>
-  <realm-name>sample</realm-name>
- </login-config>
- <security-role>
-  <role-name>manager-script</role-name>
- </security-role>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+    <filter>
+        <filter-name>injectorfilter</filter-name>
+        <filter-class>org.apache.webbeans.samples.tomcat.MyFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>injectorfilter</filter-name>
+        <servlet-name>injector</servlet-name>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    <servlet>
+        <servlet-name>injector</servlet-name>
+        <servlet-class>org.apache.webbeans.samples.tomcat.InjectorServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>injector</servlet-name>
+        <url-pattern>/injector</url-pattern>
+    </servlet-mapping>
+
+
+    <security-constraint>
+        <display-name>injector</display-name>
+        <web-resource-collection>
+            <web-resource-name>injector</web-resource-name>
+            <url-pattern>/injector/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>manager-script</role-name>
+        </auth-constraint>
+    </security-constraint>
+
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>sample</realm-name>
+    </login-config>
+
+    <security-role>
+        <role-name>manager-script</role-name>
+    </security-role>
+
 </web-app>

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/pom.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/pom.xml Tue Aug  5 08:25:01 2014
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>catalina</artifactId>
-            <version>6.0.35</version>
+            <version>${tomcat6.version}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
(original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
Tue Aug  5 08:25:01 2014
@@ -15,5 +15,5 @@
     License.
 -->
 <Context>
-  <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
+  <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" />
 </Context>

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
(original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
Tue Aug  5 08:25:01 2014
@@ -14,4 +14,4 @@
 #KIND, either express or implied.  See the License for the
 #specific language governing permissions and limitations
 #under the License.
-org.apache.webbeans.web.tomcat.TomcatWebPlugin
\ No newline at end of file
+tomcat7.TomcatWebPlugin
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml Tue Aug  5 08:25:01 2014
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
-            <version>7.0.54</version>
+            <version>${tomcat7.version}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml Tue Aug
 5 08:25:01 2014
@@ -32,7 +32,6 @@
 
     <properties>
         <tomcat.port.it>9081</tomcat.port.it>
-        <tomcat7.version>7.0.54</tomcat7.version>
         <jstl.version>1.2</jstl.version>
         <projectStage>Development</projectStage>
     </properties>

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
(original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/src/main/webapp/META-INF/context.xml
Tue Aug  5 08:25:01 2014
@@ -16,5 +16,5 @@
     License.
 -->
 <Context>
-  <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
+  <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" />
 </Context>

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin?rev=1615887&r1=1615886&r2=1615887&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
(original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
Tue Aug  5 08:25:01 2014
@@ -14,4 +14,4 @@
 #KIND, either express or implied.  See the License for the
 #specific language governing permissions and limitations
 #under the License.
-org.apache.webbeans.web.tomcat.TomcatWebPlugin
\ No newline at end of file
+org.apache.webbeans.web.tomcat7.TomcatWebPlugin
\ No newline at end of file



Mime
View raw message