Changeset 5339

Timestamp:

09/04/10 21:53:11 (17 months ago)

Author:

ffray

Message:

Added parent-bean-ref attribute to resource-Element and ContextResourceParsingHandler?. Added missing attributes bean-name and scope to XSD.

Location:

branches/release-0.13.x/pfixcore

Files:

• projects/core/schema/context-xml-service-config.xsd (modified) (1 diff)
• src/org/pustefixframework/config/contextxmlservice/parser/ContextResourceParsingHandler.java (modified) (2 diffs)

branches/release-0.13.x/pfixcore/projects/core/schema/context-xml-service-config.xsd

@@ -316 +316 @@
     </xs:sequence>
     <xs:attribute name="class" use="required"/>
+    <xs:attribute name="bean-name" use="optional" />
+    <xs:attribute name="scope" use="optional" />
+    <xs:attribute name="parent-bean-ref" use="optional"/>
   </xs:complexType>
 

branches/release-0.13.x/pfixcore/src/org/pustefixframework/config/contextxmlservice/parser/ContextResourceParsingHandler.java

@@ -61 +61 @@
         
         Element element = (Element)context.getNode();
-        ParsingUtils.checkAttributes(element, new String[] {"class"}, new String[] {"bean-name", "scope"});
+        ParsingUtils.checkAttributes(element, new String[] {"class"}, new String[] {"bean-name", "scope", "parent-bean-ref"});
         
         ContextConfigImpl config = ParsingUtils.getSingleTopObject(ContextConfigImpl.class, context);
@@ -112 +112 @@
             
         BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.genericBeanDefinition(implClass);
+        String parentBeanRef = element.getAttribute("parent-bean-ref").trim();
+        if (parentBeanRef.length() != 0) {
+            beanBuilder.setParentName(parentBeanRef);
+        }
         beanBuilder.setScope(scope);
         BeanDefinition beanDefinition = beanBuilder.getBeanDefinition();