From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 17 Dec 2007 09:28:58 +0000 (+0000)
Subject: Improve structure elements
X-Git-Tag: argeo-slc-2.1.7~3099
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=94ee5d2f1905ed467a97d9d4c9c4d0560e002e28;p=gpl%2Fargeo-slc.git

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 b0e7eeeed..88e4bb299 100644
--- 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"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="testData.nato"
@@ -12,9 +13,13 @@
 		<property name="expectedFile"
 			value="${slc.workDir}/data/expected/nato-expected.txt" />
 	</bean>
-	
-	<bean id="testData.un"
-		class="org.argeo.slc.example.ExampleTestData" scope="prototype">
+
+	<bean id="sElement.nato"
+		class="org.argeo.slc.core.structure.SimpleSElement"
+		p:label="NATO Ext" />
+
+	<bean id="testData.un" class="org.argeo.slc.example.ExampleTestData"
+		scope="prototype">
 		<property name="inputFile"
 			value="${slc.workDir}/data/input/un-in.txt" />
 		<property name="reachedFile"
@@ -22,7 +27,7 @@
 		<property name="expectedFile"
 			value="${slc.workDir}/data/expected/un-expected.txt" />
 	</bean>
-	
+
 	<bean id="testData.un.bad"
 		class="org.argeo.slc.example.ExampleTestData" scope="prototype">
 		<property name="inputFile"
@@ -32,7 +37,7 @@
 		<property name="expectedFile"
 			value="${slc.workDir}/data/expected/un-expectedXXX.txt" />
 	</bean>
-	
+
 	<bean id="testData.eu-reform"
 		class="org.argeo.slc.example.ExampleTestData" scope="prototype">
 		<property name="inputFile"
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 293d7c944..27780d316 100644
--- 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">
 			<testDefinition bean="simpleExampleTestDef" />
 			<testData bean="testData.nato" />
+			<structureElement bean="sElement.nato"/>
 		</slc.test>
 
 		<slc.test description="UN">
diff --git a/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties b/org.argeo.slc.example/exampleSlcAppli/root/Category1/slcLocal.properties
index 2a5822fbe..25bfb4236 100644
--- 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