Solve pb with p-namespace

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

diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/ExecutionFlowTest.java b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/ExecutionFlowTest.java
index 5fdfb999e5d163d22e110eb676f276a510df382b..baacc6dd9e783fc11ac96c2118f7b8a5402a951a 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/ExecutionFlowTest.java
+++ b/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/core/execution/ExecutionFlowTest.java
@@ -16,7 +16,7 @@ public class ExecutionFlowTest extends AbstractSpringTestCase {
        public void testCanonic() throws Exception {\r
                configureAndExecuteSlcFlow("minimal.xml", "minimal");\r
                // Parameter without default value in specification\r
-//             configureAndExecuteSlcFlow("canonic-001.xml", "canonic.001");\r
+               configureAndExecuteSlcFlow("canonic-001.xml", "canonic.001");\r
 //             configureAndExecuteSlcFlow("canonic-002.xml", "canonic.002");\r
 \r
 /*             try {\r

diff --git a/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/canonic.xml b/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/canonic.xml
index b5d7d5d06e84711ea5bfcf09ca01bfa6ec9906f9..1ebf829778a2b86ba80c52b666b1c69949b511e7 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/canonic.xml
+++ b/runtime/org.argeo.slc.support.simple/src/test/resources/org/argeo/slc/core/execution/canonic.xml
@@ -7,25 +7,40 @@
        http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
-       <import resource="imports.xml" /> \r
+       <import resource="imports.xml" />\r
 \r
        <bean id="canonic.spec" parent="slcTemplate.simpleSpec">\r
                <property name="attributes">\r
                        <map>\r
                                <entry key="parameterAtInstantiation">\r
-                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />\r
+                                       <bean parent="specAttr.primitive">\r
+                                               <property name="isParameter" value="true" />\r
+                                               <property name="type" value="integer" />\r
+                                       </bean>\r
                                </entry>\r
                                <entry key="displayWithoutControl">\r
-                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
-                                               p:isFrozen="true" p:type="integer" />\r
+                                       <bean parent="specAttr.primitive">\r
+                                               <property name="isParameter" value="true" />\r
+                                               <property name="type" value="integer" />\r
+                                               <property name="value" value="100" />\r
+                                       </bean>\r
                                </entry>\r
                                <entry key="displayWithControl">\r
-                                       <bean parent="specAttr.primitive" p:value="200" p:isParameter="true"\r
-                                               p:isFrozen="false" p:type="integer" />\r
+                                       <bean parent="specAttr.primitive">\r
+                                               <property name="isParameter" value="true" />\r
+                                               <property name="type" value="integer" />\r
+                                               <property name="value" value="200" />\r
+                                               <property name="isFrozen" value="false" />\r
+                                       </bean>\r
                                </entry>\r
                                <entry key="hide">\r
-                                       <bean parent="specAttr.primitive" p:value="300" p:isParameter="true"\r
-                                               p:isFrozen="false" p:isHidden="true" p:type="integer" />\r
+                                       <bean parent="specAttr.primitive">\r
+                                               <property name="isParameter" value="true" />\r
+                                               <property name="type" value="integer" />\r
+                                               <property name="value" value="300" />\r
+                                               <property name="isFrozen" value="false" />\r
+                                               <property name="isHidden" value="true" />\r
+                                       </bean>\r
                                </entry>\r
                        </map>\r
                </property>\r