Improve structure elements

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

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml b/org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml
index b0e7eeeedb63a7cfda35d50578245c5ca36b89d4..88e4bb299201f7e3f0f5007eda9cdbf0cd8e1b0c 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml
@@ -1,6 +1,7 @@
 <?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
+       xmlns:p="http://www.springframework.org/schema/p"\r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
 \r
        <bean id="testData.nato"\r
@@ -12,9 +13,13 @@
                <property name="expectedFile"\r
                        value="${slc.workDir}/data/expected/nato-expected.txt" />\r
        </bean>\r
-       \r
-       <bean id="testData.un"\r
-               class="org.argeo.slc.example.ExampleTestData" scope="prototype">\r
+\r
+       <bean id="sElement.nato"\r
+               class="org.argeo.slc.core.structure.SimpleSElement"\r
+               p:label="NATO Ext" />\r
+\r
+       <bean id="testData.un" class="org.argeo.slc.example.ExampleTestData"\r
+               scope="prototype">\r
                <property name="inputFile"\r
                        value="${slc.workDir}/data/input/un-in.txt" />\r
                <property name="reachedFile"\r
@@ -22,7 +27,7 @@
                <property name="expectedFile"\r
                        value="${slc.workDir}/data/expected/un-expected.txt" />\r
        </bean>\r
-       \r
+\r
        <bean id="testData.un.bad"\r
                class="org.argeo.slc.example.ExampleTestData" scope="prototype">\r
                <property name="inputFile"\r
@@ -32,7 +37,7 @@
                <property name="expectedFile"\r
                        value="${slc.workDir}/data/expected/un-expectedXXX.txt" />\r
        </bean>\r
-       \r
+\r
        <bean id="testData.eu-reform"\r
                class="org.argeo.slc.example.ExampleTestData" scope="prototype">\r
                <property name="inputFile"\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
index 293d7c94422f81866f2ac3606030b46d5163d6c8..27780d31610ccebcf28879547929c56a99f9d4fd 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
@@ -13,6 +13,7 @@
                <slc.test description="NATO">\r
                        <testDefinition bean="simpleExampleTestDef" />\r
                        <testData bean="testData.nato" />\r
+                       <structureElement bean="sElement.nato"/>\r
                </slc.test>\r
 \r
                <slc.test description="UN">\r

diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties b/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties
index 2a5822fbe530eb4ec2eda1d62d268aa74330552d..25bfb4236718959790475c51970ee30610d29e31 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties
@@ -1 +1 @@
-slc.dirDescription=First Category
\ No newline at end of file
+slc.dirLabel=First Category
\ No newline at end of file