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/03/06 09:36:42 UTC
[1/2] tomee git commit: cleaning auto discovery scopes
Repository: tomee
Updated Branches:
refs/heads/develop 4d0bf01a9 -> 6ffa2ca71
cleaning auto discovery scopes
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4b5a48bf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4b5a48bf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4b5a48bf
Branch: refs/heads/develop
Commit: 4b5a48bfa2d13b91d037a27a906f759604c1c514
Parents: 4d0bf01
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Mar 6 09:36:16 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Mar 6 09:36:16 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/openejb/config/AnnotationDeployer.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4b5a48bf/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
index d5b9d90..1464d36 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
@@ -197,7 +197,6 @@ import javax.enterprise.inject.Produces;
import javax.enterprise.inject.Stereotype;
import javax.enterprise.inject.spi.DefinitionException;
import javax.enterprise.inject.spi.Extension;
-import javax.inject.Scope;
import javax.interceptor.ExcludeClassInterceptors;
import javax.interceptor.ExcludeDefaultInterceptors;
import javax.interceptor.Interceptors;
@@ -1682,15 +1681,12 @@ public class AnnotationDeployer implements DynamicDeployer {
final Set<Class<? extends Annotation>> containerAnnot = new HashSet<>();
containerAnnot.add(Stereotype.class);
containerAnnot.add(NormalScope.class);
- containerAnnot.add(Scope.class);
containerAnnot.add(Dependent.class);
- containerAnnot.add(javax.inject.Singleton.class);
containerAnnot.add(ApplicationScoped.class);
containerAnnot.add(ConversationScoped.class);
containerAnnot.add(RequestScoped.class);
containerAnnot.add(SessionScoped.class);
containerAnnot.add(Model.class);
- containerAnnot.add(javax.interceptor.InterceptorBinding.class);
containerAnnot.add(Singleton.class);
containerAnnot.add(Stateless.class);
containerAnnot.add(Stateful.class);
[2/2] tomee git commit: jndi:ext context injection in test
Posted by rm...@apache.org.
jndi:ext context injection in test
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6ffa2ca7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6ffa2ca7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6ffa2ca7
Branch: refs/heads/develop
Commit: 6ffa2ca71d9af240b491f5bd1a203b339e984f38
Parents: 4b5a48b
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Mar 6 09:36:31 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Mar 6 09:36:31 2015 +0100
----------------------------------------------------------------------
.../openejb/server/ejbd/Server2ServerEjbRefTest.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6ffa2ca7/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
index 1f946be..a57fa3a 100644
--- a/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
+++ b/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
@@ -32,10 +32,12 @@ import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.ServiceDaemon;
import org.apache.openejb.server.ServicePool;
+import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.Remote;
import javax.naming.Context;
import javax.naming.InitialContext;
+import javax.naming.NamingException;
import java.util.Properties;
/**
@@ -127,10 +129,20 @@ public class Server2ServerEjbRefTest extends TestCase {
@EJB(mappedName = "jndi:ext://orange/OrangeBeanRemote")
private OrangeRemote orangeRemote;
+ @Resource(lookup = "openejb:remote_jndi_contexts/orange")
+ private Context ctx;
+
@Override
public void hasOrangeRemote() {
Assert.assertNotNull("orangeRemote is null", orangeRemote);
assertEquals("olleh", orangeRemote.echo("hello"));
+ try {
+ final OrangeRemote bean = OrangeRemote.class.cast(ctx.lookup("OrangeBeanRemoteWell "));
+ assertNotNull(bean);
+ assertEquals("olleh", bean.echo("hello"));
+ } catch (final NamingException e) {
+ fail(e.getMessage());
+ }
}
}