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 7D7241765E for ; Mon, 25 May 2015 22:54:51 +0000 (UTC) Received: (qmail 35831 invoked by uid 500); 25 May 2015 22:54:51 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 35802 invoked by uid 500); 25 May 2015 22:54:51 -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 35790 invoked by uid 99); 25 May 2015 22:54:51 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 May 2015 22:54:51 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id D9ED2AC0636 for ; Mon, 25 May 2015 22:54:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1681663 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/plugins/ webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/ webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/ webbeans-tomcat7/src/main... Date: Mon, 25 May 2015 22:54:50 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150525225450.D9ED2AC0636@hades.apache.org> Author: struberg Date: Mon May 25 22:54:50 2015 New Revision: 1681663 URL: http://svn.apache.org/r1681663 Log: OWB-1048 remove OpenWebBeansWebPlugin Not needed anymore, we don't use the sessionId as it gets permanently rewritten anyway Removed: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansWebPlugin.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1681663&r1=1681662&r2=1681663&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Mon May 25 22:54:50 2015 @@ -34,7 +34,6 @@ import org.apache.webbeans.logger.WebBea import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin; import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin; import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin; -import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin; /** *

OpenWebBeans plugins are used to extend 'core' functionality of the injection @@ -260,24 +259,6 @@ public class PluginLoader return null; } - public OpenWebBeansWebPlugin getWebPlugin() - { - if(!pluginsExist()) - { - return null; - } - - for(OpenWebBeansPlugin plugin : plugins) - { - if(plugin instanceof OpenWebBeansWebPlugin) - { - return (OpenWebBeansWebPlugin)plugin; - } - } - - return null; - } - private boolean pluginsExist() { return plugins != null && plugins.size() > 0; Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java?rev=1681663&r1=1681662&r2=1681663&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java (original) +++ openwebbeans/trunk/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java Mon May 25 22:54:50 2015 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpSessionLis import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.spi.SecurityService; import org.apache.webbeans.spi.plugins.AbstractOwbPlugin; -import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin; +import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin; /** * Tomcat plugin for OWB. @@ -41,7 +41,7 @@ import org.apache.webbeans.spi.plugins.O * @version $Rev$ $Date$ * */ -public class TomcatWebPlugin extends AbstractOwbPlugin implements OpenWebBeansWebPlugin +public class TomcatWebPlugin extends AbstractOwbPlugin implements OpenWebBeansPlugin { //Security service implementation. private final TomcatSecurityService securityService = new TomcatSecurityService(); @@ -128,10 +128,4 @@ public class TomcatWebPlugin extends Abs return false; } - - @Override - public String currentSessionId() - { - return null; // TODO - } } Modified: openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java?rev=1681663&r1=1681662&r2=1681663&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java (original) +++ openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java Mon May 25 22:54:50 2015 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpSessionLis import org.apache.webbeans.exception.WebBeansConfigurationException; import org.apache.webbeans.spi.SecurityService; import org.apache.webbeans.spi.plugins.AbstractOwbPlugin; -import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin; +import org.apache.webbeans.spi.plugins.OpenWebBeansPlugin; /** * Tomcat plugin for OWB. @@ -41,7 +41,7 @@ import org.apache.webbeans.spi.plugins.O * @version $Rev: 940336 $ $Date: 2010-05-03 02:32:18 +0300 (Mon, 03 May 2010) $ * */ -public class TomcatWebPlugin extends AbstractOwbPlugin implements OpenWebBeansWebPlugin +public class TomcatWebPlugin extends AbstractOwbPlugin implements OpenWebBeansPlugin { //Security service implementation. private final TomcatSecurityService securityService = new TomcatSecurityService(); @@ -129,9 +129,4 @@ public class TomcatWebPlugin extends Abs return false; } - @Override - public String currentSessionId() - { - return null; // TODO - } }