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 2012/11/05 13:00:18 UTC
svn commit: r1405758 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit: ApplicationComposer.java EnableServices.java

Author: rmannibucau
Date: Mon Nov  5 12:00:18 2012
New Revision: 1405758

URL: http://svn.apache.org/viewvc?rev=1405758&view=rev
Log:
adding annotation EnableServices as a shortcut to activate openejb.embedded.remotable

Added:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/EnableServices.java
      - copied, changed from r1405723, openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/MockInjector.java
Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java?rev=1405758&r1=1405757&r2=1405758&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/ApplicationComposer.java Mon Nov  5 12:00:18 2012
@@ -451,7 +451,8 @@ public class ApplicationComposer extends
 
                 assembler.buildContainerSystem(config.getOpenEjbConfiguration());
 
-                if ("true".equals(configuration.getProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "false"))) {
+                if ("true".equals(configuration.getProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "false"))
+                        || testClass.getJavaClass().getAnnotation(EnableServices.class) != null) {
                     try {
                         serviceManager = new ServiceManagerProxy();
                         serviceManager.start();

Copied: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/EnableServices.java (from r1405723, openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/MockInjector.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/EnableServices.java?p2=openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/EnableServices.java&p1=openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/MockInjector.java&r1=1405723&r2=1405758&rev=1405758&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/MockInjector.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/junit/EnableServices.java Mon Nov  5 12:00:18 2012
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target(ElementType.METHOD)
+@Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface MockInjector {
+public @interface EnableServices {
 }