geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r897680 - /geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java
Date Sun, 10 Jan 2010 18:42:42 GMT
Author: djencks
Date: Sun Jan 10 18:42:42 2010
New Revision: 897680

URL: http://svn.apache.org/viewvc?rev=897680&view=rev
Log:
XBEAN-142 another ARIES-111 related improvement

Modified:
    geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java

Modified: geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java?rev=897680&r1=897679&r2=897680&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java
(original)
+++ geronimo/xbean/trunk/xbean-blueprint/src/main/java/org/apache/xbean/blueprint/context/impl/XBeanNamespaceHandler.java
Sun Jan 10 18:42:42 2010
@@ -323,20 +323,24 @@
                 Element childElement = (Element) node;
                 String uri = childElement.getNamespaceURI();
                 String localName = childElement.getLocalName();
-
-                if (uri == null ||
-                        uri.equals(BLUEPRINT_NAMESPACE)) {
-                    if ("bean".equals(localName)) {
-                        return parserContext.parseElement(BeanMetadata.class, beanMetadata,
childElement);
-                    } else {
-                        return parserContext.parseElement(ValueMetadata.class, beanMetadata,
childElement);
-                    }
-                } else {
-                    Metadata value = parse(childElement, parserContext);
-                    if (value != null) {
-                        return value;
-                    }
+                Metadata value = parserContext.parseElement(Metadata.class, beanMetadata,
childElement);
+                if (value != null) {
+                    return value;
                 }
+                //TODO ARIES-111
+//                if (uri == null ||
+//                        uri.equals(BLUEPRINT_NAMESPACE)) {
+//                    if ("bean".equals(localName)) {
+//                        return parserContext.parseElement(BeanMetadata.class, beanMetadata,
childElement);
+//                    } else {
+//                        return parserContext.parseElement(ValueMetadata.class, beanMetadata,
childElement);
+//                    }
+//                } else {
+//                    Metadata value = parse(childElement, parserContext);
+//                    if (value != null) {
+//                        return value;
+//                    }
+//                }
             }
         }
         return null;
@@ -356,7 +360,7 @@
         if (isMap(propertyType)) {
             return parseCustomMapElement(beanMetadata, element, propertyName, parserContext);
         } else if (isCollection(propertyType)) {
-            return parserContext.parseElement(MutableCollectionMetadata.class, beanMetadata,
element);
+            return parserContext.parseElement(CollectionMetadata.class, beanMetadata, element);
         } else {
             return parseChildExtensionBean(element, beanMetadata, parserContext);
         }



Mime
View raw message