tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r510141 - in /incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: ConfigurationFactory.java EjbJarInfoBuilder.java
Date Wed, 21 Feb 2007 18:49:26 GMT
Author: dain
Date: Wed Feb 21 10:49:25 2007
New Revision: 510141

URL: http://svn.apache.org/viewvc?view=rev&rev=510141
Log:
Move GeronimoMappedName after the CmpJpaConversion since it adds new persistence-context-refs
Set default MDB interface to javax.jms.MessageListener

Modified:
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?view=diff&rev=510141&r1=510140&r2=510141
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Wed Feb 21 10:49:25 2007
@@ -120,14 +120,15 @@
         
         chain.add(new AnnotationDeployer());
 
-        if (System.getProperty("duct tape") != null){
-            chain.add(new GeronimoMappedName());
-        }
-
         chain.add(new AutoConfig());
         chain.add(new CmpJpaConversion());
         chain.add(new OpenEjb2CmpConversion());
         chain.add(new SunConversion());
+
+        if (System.getProperty("duct tape") != null){
+            // must be after CmpJpaConversion since it adds new persistence-context-refs
+            chain.add(new GeronimoMappedName());
+        }
 
         if (offline) {
             AutoDeploy autoDeploy = new AutoDeploy(this);

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?view=diff&rev=510141&r1=510140&r2=510141
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
(original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
Wed Feb 21 10:49:25 2007
@@ -494,7 +494,12 @@
         TransactionType txType = mdb.getTransactionType();
         bean.transactionType = (txType != null)?txType.toString(): TransactionType.CONTAINER.toString();
 
-        bean.mdbInterface = mdb.getMessagingType();
+        if (mdb.getMessagingType() != null) {
+            bean.mdbInterface = mdb.getMessagingType();
+        } else {
+            bean.mdbInterface = "javax.jms.MessageListener";
+        }
+
         if (mdb.getMessageDestinationType() != null) {
             bean.activationProperties.put("destinationType", mdb.getMessageDestinationType());
         }



Mime
View raw message