You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2015/05/26 00:54:50 UTC

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...

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;
 
 /**
  * <p>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
-    }
 }