Various fixes so that SLC example works again

[gpl/argeo-slc.git] / org.argeo.slc.example / exampleSlcAppli / conf / slc.xml

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml b/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
index 4e1a7a59edd2a461f73e2a27f66978f731b46945..2a52bf38ade130d4610ff3ca1cb1257e80bfc3b1 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
@@ -17,11 +17,7 @@
 \r
        <bean id="testResult"\r
                class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="numericResultId">\r
-                       <bean class="org.argeo.slc.core.test.NumericTRId">\r
-                               <property name="value" value="1" />\r
-                       </bean>\r
-               </property>\r
+               <property name="uuid" value="1" />\r
                <property name="listeners">\r
                        <list>\r
                                <ref bean="resultLogger" />\r
@@ -32,11 +28,7 @@
 \r
        <bean id="testResult2"\r
                class="org.argeo.slc.core.test.tree.TreeTestResult">\r
-               <property name="numericResultId">\r
-                       <bean class="org.argeo.slc.core.test.NumericTRId">\r
-                               <property name="value" value="2" />\r
-                       </bean>\r
-               </property>\r
+               <property name="uuid" value="2" />\r
                <property name="listeners">\r
                        <list>\r
                                <ref bean="resultLogger" />\r
@@ -49,16 +41,12 @@
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
 \r
        <bean id="resultLogger"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResultLogger"\r
-               init-method="init">\r
+               class="org.argeo.slc.core.test.tree.TreeTestResultLogger">\r
        </bean>\r
 \r
        <bean id="resultPersister"\r
-               class="org.argeo.slc.core.test.tree.TreeTestResultPersister"\r
-               init-method="init">\r
+               class="org.argeo.slc.core.test.tree.TreeTestResultPersister">\r
                <property name="testResultDao" ref="testResultDao" />\r
-               <property name="treeSPathDao" ref="treeSPathDao" />\r
-               <property name="treeSRegistryDao" ref="treeSRegistryDao" />\r
        </bean>\r
 \r
        <bean id="report"\r
@@ -72,33 +60,13 @@
        <bean id="exampleDeployedSystem"\r
                class="org.argeo.slc.example.ExampleDeployedSystem">\r
                <property name="skipFreq" value="2" />\r
-               <property name="deployedSystemId">\r
-                       <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
-                               <property name="value" value="123456" />\r
-                               <property name="distributionId">\r
-                                       <bean\r
-                                               class="org.argeo.slc.core.build.VersionDistributionId">\r
-                                               <property name="versionString" value="0.3.1" />\r
-                                       </bean>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
+               <property name="deployedSystemId" value="123456"/>\r
        </bean>\r
 \r
        <bean id="exampleDeployedSystem2"\r
                class="org.argeo.slc.example.ExampleDeployedSystem">\r
                <property name="skipFreq" value="3" />\r
-               <property name="deployedSystemId">\r
-                       <bean class="org.argeo.slc.core.deploy.NumericDSId">\r
-                               <property name="value" value="654321" />\r
-                               <property name="distributionId">\r
-                                       <bean\r
-                                               class="org.argeo.slc.core.build.VersionDistributionId">\r
-                                               <property name="versionString" value="0.3.1" />\r
-                                       </bean>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
+               <property name="deployedSystemId" value="654321"/>\r
        </bean>\r
 \r
 </beans>
\ No newline at end of file