Repository: tomee Updated Branches: refs/heads/develop a89dae644 -> 825ffe171
for super light apps tolerate to miss jms and el apis Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/825ffe17 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/825ffe17 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/825ffe17 Branch: refs/heads/develop Commit: 825ffe171cb75b236654f65ec630970f42b09524 Parents: a89dae6 Author: Romain Manni-Bucau <[email protected]> Authored: Fri Feb 20 18:03:30 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Fri Feb 20 18:03:30 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/openejb/assembler/classic/JndiBuilder.java | 2 ++ .../org/apache/openejb/cdi/ThreadSingletonServiceImpl.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/825ffe17/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java index c3a731c..d049d1b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiBuilder.java @@ -579,6 +579,8 @@ public class JndiBuilder { } } catch (final NamingException e) { throw new OpenEJBRuntimeException("Unable to bind mdb destination in jndi.", e); + } catch (final NoClassDefFoundError ncdfe) { + // no-op: no jms API } } http://git-wip-us.apache.org/repos/asf/tomee/blob/825ffe17/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java index ffd72d0..f8bdeb6 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java @@ -139,7 +139,11 @@ public class ThreadSingletonServiceImpl implements ThreadSingletonService { services.put(BeanArchiveService.class, new OpenEJBBeanInfoService()); services.put(AppContext.class, appContext); services.put(JNDIService.class, new OpenEJBJndiService()); - services.put(ELAdaptor.class, new CustomELAdapter(appContext)); + try { + services.put(ELAdaptor.class, new CustomELAdapter(appContext)); + } catch (final NoClassDefFoundError noClassDefFoundError) { + // no-op: no javax.el + } services.put(ScannerService.class, new CdiScanner()); services.put(ApplicationBoundaryService.class, new DefaultApplicationBoundaryService()); final LoaderService loaderService = SystemInstance.get().getComponent(LoaderService.class);
