Introduce context at ant level

git-svn-id: https://svn.argeo.org/slc/trunk@937 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 6ed9d9190fad04cf49790ae225899cbed92f30dc..4731c2284621ed10fc00a7a3af516a92be952626 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -41,6 +41,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
         * /org/argeo/slc/ant/taskdefs.properties\r
         */\r
        private static String SLC_TASKDEFS_RESOURCE_PATH = "/org/argeo/slc/ant/taskdefs.properties";\r
+       private static String SLC_TYPEDEFS_RESOURCE_PATH = "/org/argeo/slc/ant/typedefs.properties";\r
 \r
        @Override\r
        public void parse(Project project, Object source) throws BuildException {\r
@@ -81,7 +82,7 @@ public class SlcProjectHelper extends ProjectHelper2 {
                // create structure root\r
                registerProjectAndParents(project, slcAntConfig);\r
 \r
-               addSlcTasks(project);\r
+               addCustomTaskAndTypes(project);\r
 \r
        }\r
 \r
@@ -142,23 +143,14 @@ public class SlcProjectHelper extends ProjectHelper2 {
                // FIXME: workaround to the removal of leading '/' by Spring\r
                // use URL instead?\r
                AbstractApplicationContext context = new FileSystemXmlApplicationContext(\r
-                               '/'+acPath);\r
+                               '/' + acPath);\r
                context.registerShutdownHook();\r
                project.addReference(REF_ROOT_CONTEXT, context);\r
        }\r
 \r
        /** Loads the SLC specific Ant tasks. */\r
-       private void addSlcTasks(Project project) {\r
-               Properties taskdefs = new Properties();\r
-               try {\r
-                       InputStream in = project.getClass().getResourceAsStream(\r
-                                       SLC_TASKDEFS_RESOURCE_PATH);\r
-                       taskdefs.load(in);\r
-                       in.close();\r
-               } catch (IOException e) {\r
-                       throw new SlcAntException("Cannot load task definitions", e);\r
-               }\r
-\r
+       private void addCustomTaskAndTypes(Project project) {\r
+               Properties taskdefs = getDefs(project, SLC_TASKDEFS_RESOURCE_PATH);\r
                for (Object o : taskdefs.keySet()) {\r
                        String name = o.toString();\r
                        try {\r
@@ -168,5 +160,27 @@ public class SlcProjectHelper extends ProjectHelper2 {
                                log.error("Unknown class for task " + name, e);\r
                        }\r
                }\r
+               Properties typedefs = getDefs(project, SLC_TYPEDEFS_RESOURCE_PATH);\r
+               for (Object o : typedefs.keySet()) {\r
+                       String name = o.toString();\r
+                       try {\r
+                               project.addDataTypeDefinition(name, Class.forName(typedefs\r
+                                               .getProperty(name)));\r
+                       } catch (ClassNotFoundException e) {\r
+                               log.error("Unknown class for type " + name, e);\r
+                       }\r
+               }\r
+       }\r
+\r
+       private Properties getDefs(Project project, String path) {\r
+               Properties defs = new Properties();\r
+               try {\r
+                       InputStream in = project.getClass().getResourceAsStream(path);\r
+                       defs.load(in);\r
+                       in.close();\r
+               } catch (IOException e) {\r
+                       throw new SlcAntException("Cannot load task definitions", e);\r
+               }\r
+               return defs;\r
        }\r
 }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
index 6c64235986740357cfff57a52f818b13fabe5ea2..b7a63c9d28d42c4d02905ccd82044edcbc1d8574 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/AbstractSpringArg.java
@@ -5,11 +5,14 @@ import java.util.Vector;
 \r
 import org.springframework.beans.BeanWrapper;\r
 import org.springframework.beans.BeanWrapperImpl;\r
+import org.springframework.beans.factory.InitializingBean;\r
 import org.springframework.context.ApplicationContext;\r
 \r
+import org.apache.commons.logging.LogFactory;\r
 import org.apache.tools.ant.types.DataType;\r
 \r
 import org.argeo.slc.ant.SlcProjectHelper;\r
+import org.argeo.slc.core.SlcException;\r
 \r
 /** Abstract Ant type wrapping a Spring bean. */\r
 public abstract class AbstractSpringArg extends DataType {\r
@@ -40,9 +43,18 @@ public abstract class AbstractSpringArg extends DataType {
 \r
                        BeanWrapper wrapper = new BeanWrapperImpl(beanInstance);\r
                        for (OverrideArg override : overrides) {\r
+                               LogFactory.getLog(getClass()).debug("Prop "+override.getName());\r
                                wrapper.setPropertyValue(override.getName(), override\r
                                                .getObject());\r
                        }\r
+\r
+                       if (beanInstance instanceof InitializingBean) {\r
+                               try {\r
+                                       ((InitializingBean) beanInstance).afterPropertiesSet();\r
+                               } catch (Exception e) {\r
+                                       throw new SlcException("Could not initialize bean", e);\r
+                               }\r
+                       }\r
                }\r
                return beanInstance;\r
        }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/MapArg.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/MapArg.java
new file mode 100644 (file)
index 0000000..3bab27f
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/MapArg.java
@@ -0,0 +1,55 @@
+package org.argeo.slc.ant.spring;\r
+\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.TreeMap;\r
+import java.util.Vector;\r
+\r
+import org.argeo.slc.core.SlcException;\r
+\r
+public class MapArg {\r
+       private List<EntryArg> entries = new Vector<EntryArg>();\r
+       private Map<String, Object> map = new TreeMap<String, Object>();\r
+\r
+       public EntryArg createEntry() {\r
+               EntryArg arg = new EntryArg();\r
+               entries.add(arg);\r
+               return arg;\r
+       }\r
+\r
+       public Map<String, Object> getMap() {\r
+               if (map.size() == 0) {\r
+                       for (EntryArg arg : entries) {\r
+                               String key = arg.getKey();\r
+                               if (map.containsKey(key)) {\r
+                                       throw new SlcException("Key '" + key + "' already set.");\r
+                               } else {\r
+                                       map.put(key, arg.getValue());\r
+                               }\r
+                       }\r
+               }\r
+               return map;\r
+       }\r
+\r
+       public static class EntryArg {\r
+               private String key;\r
+               private Object value;\r
+\r
+               public String getKey() {\r
+                       return key;\r
+               }\r
+\r
+               public void setKey(String key) {\r
+                       this.key = key;\r
+               }\r
+\r
+               public Object getValue() {\r
+                       return value;\r
+               }\r
+\r
+               public void setValue(String value) {\r
+                       this.value = value;\r
+               }\r
+\r
+       }\r
+}\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
index 20508a6e8b90416c75007a3ad3ba58e7089775fa..00b2676601f7bc6fe924fc7b9ef4647f77adcc04 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
@@ -5,11 +5,14 @@ import java.util.Vector;
 \r
 import org.apache.tools.ant.BuildException;\r
 \r
+import org.argeo.slc.core.SlcException;\r
+\r
 /** Ant type allowing to override bean properties. */\r
 public class OverrideArg extends AbstractSpringArg {\r
        private String name;\r
        private Object value;\r
        private OverrideList overrideList;\r
+       private String antref;\r
 \r
        /** The name of the property to override. */\r
        public String getName() {\r
@@ -21,9 +24,17 @@ public class OverrideArg extends AbstractSpringArg {
                this.name = name;\r
        }\r
 \r
+       /** Sets a reference to an ant data type. */\r
+       public void setAntref(String antref) {\r
+               if (value != null || overrideList != null || getBean() != null) {\r
+                       throw new BuildException("Value already set.");\r
+               }\r
+               this.antref = antref;\r
+       }\r
+\r
        /** Both value and bean cannot be set. */\r
        public void setValue(String value) {\r
-               if (getBean() != null || overrideList != null) {\r
+               if (getBean() != null || overrideList != null || antref != null) {\r
                        throw new BuildException("Value already set.");\r
                }\r
                this.value = value;\r
@@ -31,7 +42,7 @@ public class OverrideArg extends AbstractSpringArg {
 \r
        @Override\r
        public void setBean(String bean) {\r
-               if (value != null || overrideList != null) {\r
+               if (value != null || overrideList != null || antref != null) {\r
                        throw new BuildException("Value already set.");\r
                }\r
                super.setBean(bean);\r
@@ -61,6 +72,13 @@ public class OverrideArg extends AbstractSpringArg {
                        return getBeanInstance();\r
                } else if (overrideList != null) {\r
                        return overrideList.getAsObjectList();\r
+               } else if (antref != null) {\r
+                       Object obj = getProject().getReference(antref);\r
+                       if (obj == null) {\r
+                               throw new SlcException("No object found for reference "\r
+                                               + antref);\r
+                       }\r
+                       return obj;\r
                } else {\r
                        throw new BuildException("Value or bean not set.");\r
                }\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/ParentContextArg.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/ParentContextArg.java
new file mode 100644 (file)
index 0000000..fe45739
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/ant/test/ParentContextArg.java
@@ -0,0 +1,64 @@
+package org.argeo.slc.ant.test;\r
+\r
+import java.util.Collection;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.TreeMap;\r
+import java.util.Vector;\r
+\r
+import org.apache.tools.ant.types.DataType;\r
+\r
+import org.argeo.slc.ant.spring.MapArg;\r
+import org.argeo.slc.core.SlcException;\r
+import org.argeo.slc.core.test.context.ContextAware;\r
+import org.argeo.slc.core.test.context.ParentContextAware;\r
+\r
+public class ParentContextArg extends DataType implements ParentContextAware {\r
+       private MapArg values = null;\r
+       private MapArg expectedValues = null;\r
+\r
+       private List<ContextAware> children = new Vector<ContextAware>();\r
+\r
+       public MapArg createValues() {\r
+               values = new MapArg();\r
+               return values;\r
+       }\r
+\r
+       public MapArg createExpectedValues() {\r
+               expectedValues = new MapArg();\r
+               return expectedValues;\r
+       }\r
+\r
+       public void addChildContext(ContextAware contextAware) {\r
+               children.add(contextAware);\r
+       }\r
+\r
+       public Collection<ContextAware> getChildContexts() {\r
+               return children;\r
+       }\r
+\r
+       public String getContextAnyFlag() {\r
+               return DEFAULT_ANY_FLAG;\r
+       }\r
+\r
+       public String getContextSkipFlag() {\r
+               return DEFAULT_SKIP_FLAG;\r
+       }\r
+\r
+       public Map<String, Object> getExpectedValues() {\r
+               if (expectedValues == null)\r
+                       expectedValues = new MapArg();\r
+               return expectedValues.getMap();\r
+       }\r
+\r
+       public Map<String, Object> getValues() {\r
+               if (values == null)\r
+                       values = new MapArg();\r
+               return values.getMap();\r
+       }\r
+\r
+       public void setValues(Map<String, Object> values) {\r
+               throw new SlcException("Cannot override values map.");\r
+       }\r
+\r
+}\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/AbstractContextTestData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/AbstractContextTestData.java
deleted file mode 100644 (file)
index ee7aad0..0000000
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/AbstractContextTestData.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.argeo.slc.core.test.context;\r
-\r
-import org.argeo.slc.core.test.TestData;\r
-import org.argeo.slc.core.test.TestDataProvider;\r
-import org.argeo.slc.core.test.TestDataUtils;\r
-\r
-public class AbstractContextTestData extends SimpleContextAware implements\r
-               TestData, TestDataProvider {\r
-\r
-       public <T extends TestData> T getTestData(Class<T> clss, String key) {\r
-               return TestDataUtils.getItSelf(clss, this);\r
-       }\r
-\r
-}\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextAware.java
index f882679db2d0e87a6d5ecf62341272a6bafd9a03..5e411831e0bef876cc175aa6b4224d432b48bdd6 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextAware.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/ContextAware.java
@@ -3,14 +3,15 @@ package org.argeo.slc.core.test.context;
 import java.util.Map;\r
 \r
 public interface ContextAware {\r
+       public final static String DEFAULT_SKIP_FLAG = "!";\r
+       public final static String DEFAULT_ANY_FLAG = "*";\r
+\r
        public Map<String, Object> getValues();\r
 \r
        public void setValues(Map<String, Object> values);\r
 \r
        public Map<String, Object> getExpectedValues();\r
 \r
-       public void setExpectedValues(Map<String, Object> expectedValues);\r
-\r
        public String getContextSkipFlag();\r
 \r
        public String getContextAnyFlag();\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java
new file mode 100644 (file)
index 0000000..a39a915
--- /dev/null
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/DefaultContextTestData.java
@@ -0,0 +1,14 @@
+package org.argeo.slc.core.test.context;\r
+\r
+import org.argeo.slc.core.test.TestData;\r
+import org.argeo.slc.core.test.TestDataProvider;\r
+import org.argeo.slc.core.test.TestDataUtils;\r
+\r
+public class DefaultContextTestData extends SimpleContextAware implements\r
+               TestData, TestDataProvider {\r
+\r
+       public <T extends TestData> T getTestData(Class<T> clss, String key) {\r
+               return TestDataUtils.getItSelf(clss, this);\r
+       }\r
+\r
+}\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
index eee918c64509103df3ed0f8266246bee55167cd5..c4fb5ab40aae9950525ec7e791b88e3be7c482cf 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
@@ -13,8 +13,8 @@ public class SimpleContextAware implements ContextAware, InitializingBean {
        private Map<String, Object> values = new TreeMap<String, Object>();\r
        private Map<String, Object> expectedValues = new TreeMap<String, Object>();\r
 \r
-       private String contextSkipFlag = "!";\r
-       private String contextAnyFlag = "*";\r
+       private String contextSkipFlag = DEFAULT_SKIP_FLAG;\r
+       private String contextAnyFlag = DEFAULT_ANY_FLAG;\r
 \r
        public Map<String, Object> getValues() {\r
                return values;\r

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java
index 15a7cede53ae186f5e9d475d3bc92b81c09e1cf0..286bee6e06d9ee49724a31f70e404dcc74f86cc3 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSRegistryDaoHibernate.java
@@ -53,8 +53,8 @@ public class TreeSRegistryDaoHibernate extends HibernateDaoSupport implements
                        syncPath(registry, localRegistry, parent);\r
                }\r
 \r
-               if (log.isDebugEnabled())\r
-                       log.debug("Synchronize path " + path);\r
+               if (log.isTraceEnabled())\r
+                       log.trace("Synchronize path " + path);\r
                \r
                if (registry.getElement(path) == null) {\r
                        if (localRegistry != null) {\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties
new file mode 100644 (file)
index 0000000..c1fb477
--- /dev/null
+++ b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties
@@ -0,0 +1,2 @@
+# Types\r
+slc.context=org.argeo.slc.ant.test.ParentContextArg\r

diff --git a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/context/applicationContext.xml b/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/context/applicationContext.xml
deleted file mode 100644 (file)
index f425235..0000000
--- a/org.argeo.slc.core/src/test/java/org/argeo/slc/core/test/context/applicationContext.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
-\r
-       <bean id="parentContext.pc1" parent="parentContext.template">\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="rootvar" value="text" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="20" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="context.c1" parent="context.template">\r
-               <property name="parentContext" ref="parentContext.pc1" />\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="reference" value="20" />\r
-                               <entry key="any" value="999" />\r
-                               <entry key="skipped" value="999" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="21" />\r
-                               <entry key="any" value="*" />\r
-                               <entry key="skipped" value="!" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="context.c2" parent="context.template">\r
-               <property name="parentContext" ref="parentContext.pc1" />\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="var" value="37" />\r
-                               <entry key="bad" value="56" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="var" value="37" />\r
-                               <entry key="bad" value="57" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="parentContext.pc2" parent="parentContext.template">\r
-               <property name="parentContext" ref="parentContext.pc1" />\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="40" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="context.c3" parent="context.template">\r
-               <property name="parentContext" ref="parentContext.pc2" />\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="reference" value="41" />\r
-                               <entry key="rootvar" value="textX" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="40" />\r
-                               <entry key="rootvar" value="text" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-\r
-       <bean id="parentContext.template"\r
-               class="org.argeo.slc.core.test.context.SimpleParentContextAware"\r
-               abstract="true">\r
-       </bean>\r
-\r
-       <bean id="context.template"\r
-               class="org.argeo.slc.core.test.context.SimpleContextAware"\r
-               abstract="true">\r
-       </bean>\r
-</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/resources/log4j.properties b/org.argeo.slc.core/src/test/resources/log4j.properties
index b92b4cca706aee6a4cdaea54bcbf9f44b17230cb..8eb8b0c9c86c72ddc2f5b61d305686653e16efae 100644 (file)
--- a/org.argeo.slc.core/src/test/resources/log4j.properties
+++ b/org.argeo.slc.core/src/test/resources/log4j.properties
@@ -3,7 +3,7 @@ log4j.rootLogger=INFO, console
 \r
 ## Levels\r
 # Slc\r
-log4j.logger.org.argeo.slc=TRACE\r
+log4j.logger.org.argeo.slc=DEBUG\r
 # Spring\r
 log4j.logger.org.springframework=INFO\r
 # Hibernate\r

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/context/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/context/applicationContext.xml
new file mode 100644 (file)
index 0000000..f425235
--- /dev/null
+++ b/org.argeo.slc.core/src/test/resources/org/argeo/slc/core/test/context/applicationContext.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
+\r
+       <bean id="parentContext.pc1" parent="parentContext.template">\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="rootvar" value="text" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="20" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="context.c1" parent="context.template">\r
+               <property name="parentContext" ref="parentContext.pc1" />\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="reference" value="20" />\r
+                               <entry key="any" value="999" />\r
+                               <entry key="skipped" value="999" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="21" />\r
+                               <entry key="any" value="*" />\r
+                               <entry key="skipped" value="!" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="context.c2" parent="context.template">\r
+               <property name="parentContext" ref="parentContext.pc1" />\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="var" value="37" />\r
+                               <entry key="bad" value="56" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="var" value="37" />\r
+                               <entry key="bad" value="57" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="parentContext.pc2" parent="parentContext.template">\r
+               <property name="parentContext" ref="parentContext.pc1" />\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="40" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="context.c3" parent="context.template">\r
+               <property name="parentContext" ref="parentContext.pc2" />\r
+               <property name="values">\r
+                       <map>\r
+                               <entry key="reference" value="41" />\r
+                               <entry key="rootvar" value="textX" />\r
+                       </map>\r
+               </property>\r
+               <property name="expectedValues">\r
+                       <map>\r
+                               <entry key="reference" value="40" />\r
+                               <entry key="rootvar" value="text" />\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+\r
+       <bean id="parentContext.template"\r
+               class="org.argeo.slc.core.test.context.SimpleParentContextAware"\r
+               abstract="true">\r
+       </bean>\r
+\r
+       <bean id="context.template"\r
+               class="org.argeo.slc.core.test.context.SimpleContextAware"\r
+               abstract="true">\r
+       </bean>\r
+</beans>
\ No newline at end of file