svn commit: r1195232 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: BeanContext.java config/AnnotationDeployer.java

[rmannibucau]

Author: rmannibucau
Date: Sun Oct 30 19:34:59 2011
New Revision: 1195232

URL: http://svn.apache.org/viewvc?rev=1195232&view=rev
Log:
avoiding to bind Comp bean twice with the same name using a maven build

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java?rev=1195232&r1=1195231&r2=1195232&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
 Sun Oct 30 19:34:59 2011
@@ -49,7 +49,6 @@ import org.apache.webbeans.context.creat
 import org.apache.webbeans.inject.AbstractInjectable;
 import org.apache.xbean.recipe.ConstructionException;
 
-import javax.annotation.ManagedBean;
 import javax.ejb.EJBHome;
 import javax.ejb.EJBLocalHome;
 import javax.ejb.EJBLocalObject;

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1195232&r1=1195231&r2=1195232&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
 Sun Oct 30 19:34:59 2011
@@ -216,7 +216,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
@@ -1076,7 +1075,15 @@ public class AnnotationDeployer implemen
                         }
                     }
 
-                    final String name = 
BeanContext.Comp.openejbCompName(ejbModule.getModuleId());
+                    // passing jar location to be able to manage maven 
classes/test-classes which have the same moduleId
+                    String id = ejbModule.getModuleId();
+                    if 
(ejbModule.getJarLocation().contains(ejbModule.getModuleId() + 
"/target/test-classes")) {
+                        // with maven if both src/main/java and src/test/java 
are deployed
+                        // moduleId.Comp exists twice so it fails
+                        // here we simply modify the test comp bean name to 
avoid it
+                        id += "_test";
+                    }
+                    final String name = BeanContext.Comp.openejbCompName(id);
                     final org.apache.openejb.jee.ManagedBean managedBean = new 
org.apache.openejb.jee.ManagedBean(name, BeanContext.Comp.class);
                     managedBean.setTransactionType(TransactionType.BEAN);
                     ejbModule.getEjbJar().addEnterpriseBean(managedBean);