[jboss-cvs] JBossAS SVN: r95764 - in projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee: support and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2009-10-29 11:25:56 -0400 (Thu, 29 Oct 2009)
New Revision: 95764

Modified:
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/DataSourceMetaData.java
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
   projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java
Log:
- The regular merge seems good enough.
- Remove a fixme: calling merge (or augment) should be legitimate even if meta data thinks it is not.

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/DataSourceMetaData.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/DataSourceMetaData.java	2009-10-29 15:24:41 UTC (rev 95763)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/DataSourceMetaData.java	2009-10-29 15:25:56 UTC (rev 95764)
@@ -261,7 +261,10 @@
          setPortNumber(override.portNumber);
       else if (original != null && original.portNumber != DEFAULT_PORT_NUMBER)
          setPortNumber(original.portNumber);
-      // TODO: do something for properties
+      if (override != null && override.properties != null)
+         setProperties(override.properties);
+      else if (original != null && original.properties != null)
+         setProperties(original.properties);
       if (override != null && override.serverName != null)
          setServerName(override.serverName);
       else if (original != null && original.serverName != null)

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java	2009-10-29 15:24:41 UTC (rev 95763)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/spec/ResourceInjectionMetaData.java	2009-10-29 15:25:56 UTC (rev 95764)
@@ -205,8 +205,6 @@
          setIgnoreDependency(override.ignoreDependency);
       else if (original != null && original.ignoreDependency != null)
          setIgnoreDependency(original.ignoreDependency);
-      
-      // TODO proper merge
       if (override != null && override.injectionTargets != null)
          setInjectionTargets(override.injectionTargets);
       else if (original != null && original.injectionTargets != null)

Modified: projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java
===================================================================
--- projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java	2009-10-29 15:24:41 UTC (rev 95763)
+++ projects/metadata/common/trunk/src/main/java/org/jboss/metadata/javaee/support/JavaEEMetaDataUtil.java	2009-10-29 15:25:56 UTC (rev 95764)
@@ -77,7 +77,7 @@
       if (overriden == null || overriden.isEmpty())
       {
          // There are no overrides and no overriden
-         // TODO: it has been really silly to call upon merge, but allas
+         // Note: it has been really silly to call upon merge, but allas
          if (mapped == null)
             return merged;