You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/19 19:53:37 UTC
tomee git commit: ContextFactory doesnt exist anymore
Repository: tomee
Updated Branches:
refs/heads/master abc47e896 -> 757e4e83f
ContextFactory doesnt exist anymore
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/757e4e83
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/757e4e83
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/757e4e83
Branch: refs/heads/master
Commit: 757e4e83f8eaa3d102ca54d353bc8bd8bf838e55
Parents: abc47e8
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun Apr 19 19:53:30 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun Apr 19 19:53:30 2015 +0200
----------------------------------------------------------------------
.../openejb/tck/cdi/tomee/embedded/ContextsImpl.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/757e4e83/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
index 7682f45..89afdae 100644
--- a/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
+++ b/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
@@ -18,8 +18,8 @@ package org.apache.openejb.tck.cdi.tomee.embedded;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.context.AbstractContext;
-import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.RequestContext;
+import org.apache.webbeans.spi.ContextsService;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
@@ -30,14 +30,14 @@ import javax.enterprise.context.RequestScoped;
public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractContext> {
public AbstractContext getRequestContext() {
- ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
- RequestContext ctx = (RequestContext) contextFactory.getStandardContext(RequestScoped.class);
+ ContextsService contextFactory = WebBeansContext.currentInstance().getContextsService();
+ RequestContext ctx = (RequestContext) contextFactory.getCurrentContext(RequestScoped.class);
if (ctx == null) {
- contextFactory.initRequestContext(null);
+ contextFactory.startContext(RequestScoped.class, null);
}
- return (AbstractContext) contextFactory.getStandardContext(RequestScoped.class);
+ return (AbstractContext) contextFactory.getCurrentContext(RequestScoped.class);
}
public void setActive(AbstractContext context) {
@@ -50,8 +50,8 @@ public class ContextsImpl implements org.jboss.jsr299.tck.spi.Contexts<AbstractC
}
public AbstractContext getDependentContext() {
- ContextFactory contextFactory = WebBeansContext.currentInstance().getContextFactory();
- return (AbstractContext) contextFactory.getStandardContext(Dependent.class);
+ ContextsService contextFactory = WebBeansContext.currentInstance().getContextsService();
+ return (AbstractContext) contextFactory.getCurrentContext(Dependent.class);
}
public void destroyContext(AbstractContext context) {