svn commit: r1389384 - in /openejb/trunk/openejb/container: openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Sep 24 14:02:06 2012
New Revision: 1389384

URL: http://svn.apache.org/viewvc?rev=1389384&view=rev
Log:
manage global properties for pojo deployment too

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
    openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1389384&r1=1389383&r2=1389384&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Mon Sep 24 14:02:06 2012
@@ -292,7 +292,7 @@ public class ReadDescriptors implements 
         if (source != null) {
             try {
                 // Attempt to parse it first as a v3 descriptor
-                OpenejbJar openejbJar = JaxbOpenejbJar3.unmarshal(OpenejbJar.class, source.get());
+                OpenejbJar openejbJar = JaxbOpenejbJar3.unmarshal(OpenejbJar.class, source.get()).postRead();
                 ejbModule.setOpenejbJar(openejbJar);
             } catch (final Exception v3ParsingException) {
                 // Attempt to parse it second as a v2 descriptor

Modified: openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java?rev=1389384&r1=1389383&r2=1389384&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java (original)
+++ openejb/trunk/openejb/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/OpenejbJar.java Mon Sep 24 14:02:06 2012
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlAcce
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.util.ArrayList;
@@ -125,4 +126,17 @@ public class OpenejbJar implements Named
     public EjbDeployment addEjbDeployment(EnterpriseBean bean) {
         return addEjbDeployment(new EjbDeployment(bean));
     }
+
+    public OpenejbJar postRead() {
+        if (pojoDeployment != null && properties != null) {
+            for (PojoDeployment pojo : pojoDeployment) {
+                for (String key : properties.stringPropertyNames()) {
+                    if (!pojo.getProperties().containsKey(key)) {
+                        pojo.getProperties().put(key, properties.get(key));
+                    }
+                }
+            }
+        }
+        return this;
+    }
 }