X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2FNamespaceUtils.java;h=80f17565af8c0282b7c62fbeac4add8a8ebdf540;hb=60677ee743e6d54ceda3187824cef28cf844ccc0;hp=14c78cadf1dee12ce199f4b800d9c19c7d840bec;hpb=bb58cdb33cceffa06b72bc191e63022b9a739d14;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/NamespaceUtils.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/NamespaceUtils.java
index 14c78cadf..80f17565a 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/NamespaceUtils.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/NamespaceUtils.java
@@ -1,8 +1,25 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution.xml;
 
 import org.argeo.slc.SlcException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -14,6 +31,8 @@ import org.w3c.dom.NodeList;
  * converting it into bean definitions.
  */
 public class NamespaceUtils {
+	// private final static Log log = LogFactory.getLog(NamespaceUtils.class);
+
 	/**
 	 * Returns the value defined either: directly by the the 'value' attribute,
 	 * as reference by the 'ref' attribute or as a nested bean.
@@ -51,7 +70,7 @@ public class NamespaceUtils {
 			if (value != null)
 				throw new SlcException("Multiple value definition for "
 						+ element);
-			value = parseBeanReference(uniqueSubElem, parserContext,
+			value = parseBeanOrReference(uniqueSubElem, parserContext,
 					containingBeanDefintion);
 		}
 		return value;
@@ -75,10 +94,15 @@ public class NamespaceUtils {
 		return uniqueSubElem;
 	}
 
-	public static Object parseBeanReference(Element element,
+	public static Object parseBeanOrReference(Element element,
 			ParserContext parserContext, BeanDefinition beanDefinition) {
-		return parserContext.getDelegate().parsePropertySubElement(element,
-				beanDefinition);
-	}
+		// return parserContext.getDelegate().parsePropertySubElement(element,
+		// beanDefinition);
 
+		BeanDefinitionParserDelegate deleg = parserContext.getDelegate();
+		// if ("bean".equals(element.getNodeName()))
+		// return deleg.parseBeanDefinitionElement(element, beanDefinition);
+		// else
+		return deleg.parsePropertySubElement(element, beanDefinition);
+	}
 }