Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 418CB10AD5 for ; Tue, 5 Aug 2014 08:25:30 +0000 (UTC) Received: (qmail 65358 invoked by uid 500); 5 Aug 2014 08:25:30 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 65335 invoked by uid 500); 5 Aug 2014 08:25:30 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 65321 invoked by uid 99); 5 Aug 2014 08:25:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 08:25:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Aug 2014 08:25:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 942872389034; Tue, 5 Aug 2014 08:25:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140805082502.942872389034@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ 1.0 1.0 1.1 + 6.0.35 + 7.0.54 3.1.4 1.2.9 2.2.3 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. --> - + 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. 4.0.0 Sample Tomcat7 Application - samples org.apache.openwebbeans + samples 1.2.7-SNAPSHOT ../pom.xml @@ -38,28 +38,12 @@ under the License. - org.apache.openwebbeans - openwebbeans-impl - - - - org.apache.openwebbeans - openwebbeans-web - ${project.version} - - - org.apache.geronimo.specs geronimo-servlet_3.0_spec 1.0 provided - - org.apache.openwebbeans - openwebbeans-ee-common - ${project.version} - org.apache.geronimo.specs @@ -72,32 +56,146 @@ under the License. geronimo-atinject_1.0_spec provided - - - org.apache.openwebbeans - openwebbeans-spi - ${project.version} - provided - - - - org.apache.openwebbeans - openwebbeans-resource - ${project.version} - - tomcat-sample - org.codehaus.mojo - tomcat-maven-plugin - 1.1 + org.apache.tomcat.maven + tomcat7-maven-plugin - http://localhost:8080/manager/text + ${project.basedir}/src/main/tomcat/tomcat-users.xml + ${project.basedir}/src/main/tomcat/context.xml + + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat7.version} + + + org.apache.tomcat + tomcat-util + ${tomcat7.version} + + + org.apache.tomcat + tomcat-coyote + ${tomcat7.version} + + + org.apache.tomcat + tomcat-api + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-jdbc + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-dbcp + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-servlet-api + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-jsp-api + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-jasper + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-jasper-el + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-el-api + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-catalina + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-tribes + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-catalina-ha + ${tomcat7.version} + + + + org.apache.tomcat + tomcat-annotations-api + ${tomcat7.version} + + + + + org.apache.openwebbeans + openwebbeans-impl + ${project.version} + + + org.apache.openwebbeans + openwebbeans-spi + ${project.version} + + + org.apache.openwebbeans + openwebbeans-web + ${project.version} + + + org.apache.openwebbeans + openwebbeans-tomcat7 + ${project.version} + + + + org.apache.geronimo.specs + geronimo-jcdi_1.1_spec + ${geronimo_cdi.version} + + + org.apache.geronimo.specs + geronimo-atinject_1.0_spec + ${geronimo_atinject.version} + + + org.apache.geronimo.specs + geronimo-interceptor_1.2_spec + ${geronimo_interceptor.version} + + + 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> beans = manager.getBeans(CurrentDateProvider.class, new Annotation[]{new DefaultLiteral()}); - System.out.println("Total found beans : " + beans.size()); + Set> beans = manager.getBeans(CurrentDateProvider.class); + log.info("Total found beans : " + beans.size()); Bean provider = (Bean)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. --> - - injectorfilter - org.apache.webbeans.samples.tomcat.MyFilter - - - injectorfilter - injector - REQUEST - - - injector - org.apache.webbeans.samples.tomcat.InjectorServlet - - - injector - /injector - - - injector - - injector - /injector/* - - - manager-script - - - - BASIC - sample - - - manager-script - + 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"> + + injectorfilter + org.apache.webbeans.samples.tomcat.MyFilter + + + injectorfilter + injector + REQUEST + + + injector + org.apache.webbeans.samples.tomcat.InjectorServlet + + + injector + /injector + + + + + injector + + injector + /injector/* + + + manager-script + + + + + BASIC + sample + + + + manager-script + + 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 @@ org.apache.tomcat catalina - 6.0.35 + ${tomcat6.version} provided 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. --> - + 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 @@ org.apache.tomcat tomcat-catalina - 7.0.54 + ${tomcat7.version} provided 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 @@ 9081 - 7.0.54 1.2 Development 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. --> - + 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