Repository: tomee Updated Branches: refs/heads/master 001bd23bb -> 1e142d013
TOMEE-1920 remove OpenWebBeansJsfPlugin OpenWebBeansJsfPlugin was already empty since quite a while (1.5.0), so we finally removed it from OWB. The webbeans-jsf module remains of course! Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1e142d01 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1e142d01 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1e142d01 Branch: refs/heads/master Commit: 1e142d0133f037ba4c6408165a0cd0a22bef5c98 Parents: 001bd23 Author: Mark Struberg <strub...@apache.org> Authored: Mon Aug 29 22:47:44 2016 +0200 Committer: Mark Struberg <strub...@apache.org> Committed: Mon Aug 29 22:47:44 2016 +0200 ---------------------------------------------------------------------- .../apache/openejb/cdi/OptimizedLoaderService.java | 14 -------------- examples/arquillian-jpa/README.md | 1 - examples/datasource-versioning/README.md | 1 - examples/resources-jmx-example/README.md | 2 -- ...org.apache.webbeans.spi.plugins.OpenWebBeansPlugin | 1 - .../test/resources/test/log/catalina.2014-02-07.log | 1 - 6 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java index 93f1645..e913986 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/OptimizedLoaderService.java @@ -214,20 +214,6 @@ public class OptimizedLoaderService implements LoaderService { // ignore } } - { - final Class<?> clazz; - try { - clazz = loader.loadClass("org.apache.webbeans.jsf.plugin.OpenWebBeansJsfPlugin"); - try { - list.add(OpenWebBeansPlugin.class.cast( - Proxy.newProxyInstance(loader, new Class<?>[]{OpenWebBeansPlugin.class}, new ClassLoaderAwareHandler(clazz.getSimpleName(), clazz.newInstance(), loader)))); - } catch (final Exception e) { - log.error("Unable to load OpenWebBeansPlugin: OpenWebBeansJsfPlugin"); - } - } catch (final ClassNotFoundException e) { - // ignore - } - } return list; } http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/examples/arquillian-jpa/README.md ---------------------------------------------------------------------- diff --git a/examples/arquillian-jpa/README.md b/examples/arquillian-jpa/README.md index d318839..c8f39ae 100644 --- a/examples/arquillian-jpa/README.md +++ b/examples/arquillian-jpa/README.md @@ -127,7 +127,6 @@ if you don't use workarounds like https://github.com/rmannibucau/persistence-wit INFOS - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@13158bbd INFOS - OpenWebBeans Container is starting... INFOS - Adding OpenWebBeansPlugin : [CdiPlugin] - INFOS - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin] INFOS - All injection points were validated successfully. INFOS - OpenWebBeans Container has started, it took 224 ms. INFOS - Deployed Application(path=/home/rmannibucau/dev/Apache/tomee-trunk/examples/arquillian-jpa/target/arquillian-test-working-dir/0/UserPersistenceTest) http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/examples/datasource-versioning/README.md ---------------------------------------------------------------------- diff --git a/examples/datasource-versioning/README.md b/examples/datasource-versioning/README.md index 3ddabcc..63823a3 100644 --- a/examples/datasource-versioning/README.md +++ b/examples/datasource-versioning/README.md @@ -272,7 +272,6 @@ Both examples demonstrate the same, in that two driver versions can be loaded an INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@22c2e2dd INFO - OpenWebBeans Container is starting... INFO - Adding OpenWebBeansPlugin : [CdiPlugin] - INFO - Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin] INFO - All injection points were validated successfully. INFO - OpenWebBeans Container has started, it took 203 ms. INFO - Created Ejb(deployment-id=DataSourceTester, ejb-name=DataSourceTester, container=Default Stateless Container) http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/examples/resources-jmx-example/README.md ---------------------------------------------------------------------- diff --git a/examples/resources-jmx-example/README.md b/examples/resources-jmx-example/README.md index 29b6a69..05a38ca 100644 --- a/examples/resources-jmx-example/README.md +++ b/examples/resources-jmx-example/README.md @@ -651,7 +651,6 @@ When run you should see output similar to the following. Apr 15, 2015 12:40:24 PM org.apache.webbeans.plugins.PluginLoader startUp INFO: Adding OpenWebBeansPlugin : [CdiPlugin] Apr 15, 2015 12:40:24 PM org.apache.webbeans.plugins.PluginLoader startUp - INFO: Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin] Apr 15, 2015 12:40:25 PM org.apache.webbeans.config.BeansDeployer validateInjectionPoints INFO: All injection points were validated successfully. Apr 15, 2015 12:40:25 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication @@ -673,7 +672,6 @@ When run you should see output similar to the following. Apr 15, 2015 12:40:25 PM org.apache.webbeans.plugins.PluginLoader startUp INFO: Adding OpenWebBeansPlugin : [CdiPlugin] Apr 15, 2015 12:40:25 PM org.apache.webbeans.plugins.PluginLoader startUp - INFO: Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin] Apr 15, 2015 12:40:25 PM org.apache.webbeans.config.BeansDeployer validateInjectionPoints INFO: All injection points were validated successfully. Apr 15, 2015 12:40:25 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/tomee/tomee-embedded/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin ---------------------------------------------------------------------- diff --git a/tomee/tomee-embedded/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin b/tomee/tomee-embedded/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin index 6b0f678..49182f7 100644 --- a/tomee/tomee-embedded/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin +++ b/tomee/tomee-embedded/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin @@ -1,3 +1,2 @@ -org.apache.webbeans.jsf.plugin.OpenWebBeansJsfPlugin org.apache.openejb.cdi.CdiPlugin http://git-wip-us.apache.org/repos/asf/tomee/blob/1e142d01/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log ---------------------------------------------------------------------- diff --git a/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log b/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log index f216bce..f1e133b 100644 --- a/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log +++ b/tomee/tomee-webaccess/src/test/resources/test/log/catalina.2014-02-07.log @@ -129,7 +129,6 @@ INFO: OpenWebBeans Container is starting... Feb 07, 2014 10:40:12 PM org.apache.webbeans.plugins.PluginLoader startUp INFO: Adding OpenWebBeansPlugin : [CdiPlugin] Feb 07, 2014 10:40:12 PM org.apache.webbeans.plugins.PluginLoader startUp -INFO: Adding OpenWebBeansPlugin : [OpenWebBeansJsfPlugin] Feb 07, 2014 10:40:12 PM org.apache.webbeans.config.BeansDeployer validateInjectionPoints INFO: All injection points were validated successfully. Feb 07, 2014 10:40:12 PM org.apache.openejb.cdi.OpenEJBLifecycle startApplication
