Return-Path: Delivered-To: apmail-geronimo-xbean-scm-archive@minotaur.apache.org Received: (qmail 60527 invoked from network); 10 Jan 2010 18:43:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2010 18:43:06 -0000 Received: (qmail 32080 invoked by uid 500); 10 Jan 2010 18:43:06 -0000 Delivered-To: apmail-geronimo-xbean-scm-archive@geronimo.apache.org Received: (qmail 32058 invoked by uid 500); 10 Jan 2010 18:43:06 -0000 Mailing-List: contact xbean-scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: xbean-scm@geronimo.apache.org Delivered-To: mailing list xbean-scm@geronimo.apache.org Received: (qmail 32049 invoked by uid 99); 10 Jan 2010 18:43:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 18:43:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 18:43:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E69A2388978; Sun, 10 Jan 2010 18:42:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: xbean-scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100110184243.0E69A2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); }