svn commit: r901465 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

[dblevins]

Author: dblevins
Date: Thu Jan 21 00:31:11 2010
New Revision: 901465

URL: http://svn.apache.org/viewvc?rev=901465&view=rev
Log:
OPENEJB-1208: Handle "destinationName" as synonym for the "destination" 
ActivationConfigProperty

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

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=901465&r1=901464&r2=901465&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
 Thu Jan 21 00:31:11 2010
@@ -49,6 +49,7 @@
 import org.apache.openejb.jee.AdminObject;
 import org.apache.openejb.jee.PersistenceContextRef;
 import org.apache.openejb.jee.PersistenceRef;
+import org.apache.openejb.jee.ActivationConfigProperty;
 import org.apache.openejb.jee.jpa.unit.Persistence;
 import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
@@ -72,6 +73,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collection;
+import java.util.Iterator;
 import java.net.URI;
 
 public class AutoConfig implements DynamicDeployer {
@@ -328,9 +330,27 @@
 
                 Properties properties = 
mdb.getActivationConfig().toProperties();
 
+                String destination = properties.getProperty("destinationName");
+
+                if (destination != null) {
+                    mdb.getActivationConfig().addProperty("destination", 
destination);
+
+                    // Remove destinationName as it is not in the standard 
ActivationSpec 
+                    List<ActivationConfigProperty> list = 
mdb.getActivationConfig().getActivationConfigProperty();
+                    Iterator<ActivationConfigProperty> iterator = 
list.iterator();
+                    while (iterator.hasNext()) {
+                        ActivationConfigProperty configProperty = 
iterator.next();
+                        if 
(configProperty.getActivationConfigPropertyName().equals("destinationName")){
+                            iterator.remove();
+                            break;
+                        }
+                    }
+                } else {
+                    destination = properties.getProperty("destination");
+                }
 
                 // destination
-                String destination = properties.getProperty("destination", 
properties.getProperty("destinationName"));
+//                String destination = properties.getProperty("destination", 
properties.getProperty("destinationName"));
                 if (destination == null) {
                     destination = ejbDeployment.getDeploymentId();
                     mdb.getActivationConfig().addProperty("destination", 
destination);