Author: rmannibucau
Date: Thu Jul 19 18:40:26 2012
New Revision: 1363469
URL: http://svn.apache.org/viewvc?rev=1363469&view=rev
Log:
tck modules for owb changes
Modified:
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ManagersImpl.java
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
Modified:
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ContextsImpl.java
Thu Jul 19 18:40:26 2012
@@ -20,8 +20,8 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.context.AbstractContext;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.RequestContext;
-import org.apache.webbeans.context.type.ContextTypes;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
/**
@@ -37,7 +37,7 @@ public class ContextsImpl implements org
contextFactory.initRequestContext(null);
}
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.REQUEST);
+ return (AbstractContext)
contextFactory.getStandardContext(RequestScoped.class);
}
public void setActive(AbstractContext context) {
@@ -51,7 +51,7 @@ public class ContextsImpl implements org
public AbstractContext getDependentContext() {
ContextFactory contextFactory =
WebBeansContext.currentInstance().getContextFactory();
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.DEPENDENT);
+ return (AbstractContext)
contextFactory.getStandardContext(Dependent.class);
}
public void destroyContext(AbstractContext context) {
Modified:
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ManagersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ManagersImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ManagersImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/ManagersImpl.java
Thu Jul 19 18:40:26 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.embedded;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectableBeanManager;
import javax.enterprise.inject.spi.BeanManager;
@@ -26,7 +27,7 @@ import javax.enterprise.inject.spi.BeanM
public class ManagersImpl implements org.jboss.jsr299.tck.spi.Managers {
public BeanManager getManager() {
- return new InjectableBeanManager();
+ return new
InjectableBeanManager(WebBeansContext.currentInstance().getBeanManagerImpl());
}
}
Modified:
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ContextsImpl.java
Thu Jul 19 18:40:26 2012
@@ -20,8 +20,8 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.context.AbstractContext;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.RequestContext;
-import org.apache.webbeans.context.type.ContextTypes;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
/**
@@ -37,7 +37,7 @@ public class ContextsImpl implements org
contextFactory.initRequestContext(null);
}
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.REQUEST);
+ return (AbstractContext)
contextFactory.getStandardContext(RequestScoped.class);
}
public void setActive(AbstractContext context) {
@@ -51,7 +51,7 @@ public class ContextsImpl implements org
public AbstractContext getDependentContext() {
ContextFactory contextFactory =
WebBeansContext.currentInstance().getContextFactory();
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.DEPENDENT);
+ return (AbstractContext)
contextFactory.getStandardContext(Dependent.class);
}
public void destroyContext(AbstractContext context) {
Modified:
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-tomee-embedded/src/main/java/org/apache/openejb/tck/cdi/tomee/embedded/ManagersImpl.java
Thu Jul 19 18:40:26 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.tomee.embedded;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectableBeanManager;
import javax.enterprise.inject.spi.BeanManager;
@@ -26,7 +27,7 @@ import javax.enterprise.inject.spi.BeanM
public class ManagersImpl implements org.jboss.jsr299.tck.spi.Managers {
public BeanManager getManager() {
- return new InjectableBeanManager();
+ return new
InjectableBeanManager(WebBeansContext.currentInstance().getBeanManagerImpl());
}
}
Modified:
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ContextsImpl.java
Thu Jul 19 18:40:26 2012
@@ -20,8 +20,8 @@ import org.apache.webbeans.config.WebBea
import org.apache.webbeans.context.AbstractContext;
import org.apache.webbeans.context.ContextFactory;
import org.apache.webbeans.context.RequestContext;
-import org.apache.webbeans.context.type.ContextTypes;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
/**
@@ -37,7 +37,7 @@ public class ContextsImpl implements org
contextFactory.initRequestContext(null);
}
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.REQUEST);
+ return (AbstractContext)
contextFactory.getStandardContext(RequestScoped.class);
}
public void setActive(AbstractContext context) {
@@ -51,7 +51,7 @@ public class ContextsImpl implements org
public AbstractContext getDependentContext() {
ContextFactory contextFactory =
WebBeansContext.currentInstance().getContextFactory();
- return (AbstractContext)
contextFactory.getStandardContext(ContextTypes.DEPENDENT);
+ return (AbstractContext)
contextFactory.getStandardContext(Dependent.class);
}
public void destroyContext(AbstractContext context) {
Modified:
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java?rev=1363469&r1=1363468&r2=1363469&view=diff
==============================================================================
---
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
(original)
+++
openejb/trunk/openejb/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/ManagersImpl.java
Thu Jul 19 18:40:26 2012
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tck.cdi.tomee;
+import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.container.InjectableBeanManager;
import javax.enterprise.inject.spi.BeanManager;
@@ -26,7 +27,7 @@ import javax.enterprise.inject.spi.BeanM
public class ManagersImpl implements org.jboss.jsr299.tck.spi.Managers {
public BeanManager getManager() {
- return new InjectableBeanManager();
+ return new
InjectableBeanManager(WebBeansContext.currentInstance().getBeanManagerImpl());
}
}
