Improve example structure

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

diff --git a/org.argeo.slc.example/.classpath b/org.argeo.slc.example/.classpath
index 06e97dacca9f6debbe827f0dff15af778382ec1b..b6a31cb817bda37ed2ba8112af99f29d905e6ca6 100644 (file)
--- a/org.argeo.slc.example/.classpath
+++ b/org.argeo.slc.example/.classpath
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="src" path="src/test/java"/>
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml b/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml
new file mode 100644 (file)
index 0000000..522acb9
--- /dev/null
+++ b/org.argeo.slc.example/src/main/resources/org/argeo/slc/example/ws/client/spring/applicationContext.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+       default-lazy-init="true">
+
+       <import
+               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+       <import
+               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
+
+
+       <bean id="exampleDefault.ws.client.webServiceTemplate"
+               parent="slcTemplate.ws.client.webServiceTemplate">
+               <constructor-arg ref="slcDefault.ws.client.messageFactory" />
+               <property name="defaultUri" value="${slc.ws.uri}" />
+       </bean>
+
+       <bean name="exampleDefault.ws.client.slcExecutionNotifier"
+               parent="slcDefault.ws.client.slcExecutionNotifier">
+               <property name="template"
+                       ref="exampleDefault.ws.client.webServiceTemplate" />
+       </bean>
+
+       <bean name="exampleDefault.ws.client.treeTestResultWsNotfier"
+               parent="slcDefault.ws.client.treeTestResultWsNotfier">
+               <property name="template"
+                       ref="exampleDefault.ws.client.webServiceTemplate" />
+       </bean>
+
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
+               lazy-init="false">
+               <property name="systemPropertiesModeName"
+                       value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="properties">
+                       <props>
+                               <prop key="slc.ws.uri">
+                                       http://localhost:9090/org.argeo.slc.webapp/slcService/
+                               </prop>
+                       </props>
+               </property>
+       </bean>
+
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml b/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
index 64f39f5f65f727612e3b5dbd07f861c34af83cf4..b671a0c56ddc91cdfa82f94b6544db9065e5ef40 100644 (file)
--- a/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
+++ b/org.argeo.slc.example/src/main/slc/conf/runtime/default.xml
@@ -9,22 +9,19 @@
                resource="classpath:/org/argeo/slc/core/process/spring/applicationContext.xml" />
 
        <bean id="testResult"
-               class="org.argeo.slc.core.test.tree.TreeTestResult">
-               <property name="uuid" value="1" />
+               parent="slcDefault.test.basicTreeTestResult">
                <property name="listeners">
-                       <list>
-                               <ref bean="slcDefault.test.resultLogger" />
+                       <list merge="true">
                                <ref bean="slcDefault.castor.xsltReportGenerator" />
                        </list>
                </property>
        </bean>
 
        <bean id="testResult2"
-               class="org.argeo.slc.core.test.tree.TreeTestResult">
-               <property name="uuid" value="2" />
+               parent="slcDefault.test.basicTreeTestResult">
                <property name="listeners">
-                       <list>
-                               <ref bean="slcDefault.test.resultLogger" />
+                       <list merge="true">
+                               <ref bean="slcDefault.castor.xsltReportGenerator" />
                        </list>
                </property>
        </bean>
@@ -35,7 +32,6 @@
                <property name="notifiers">
                        <list>
                                <ref bean="slcDefault.process.fileSlcExecutionNotifier" />
-                               <!-- <ref bean="webServiceNotifier" />-->
                        </list>
                </property>
        </bean>

diff --git a/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml b/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml
new file mode 100644 (file)
index 0000000..36c5015
--- /dev/null
+++ b/org.argeo.slc.example/src/main/slc/conf/runtime/ws.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+       <import
+               resource="classpath:/org/argeo/slc/example/ws/client/spring/applicationContext.xml" />
+
+       <bean id="testResult"
+               parent="slcDefault.test.basicTreeTestResult">
+               <property name="listeners">
+                       <list merge="true">
+                               <ref
+                                       bean="exampleDefault.ws.client.treeTestResultWsNotfier" />
+                       </list>
+               </property>
+       </bean>
+
+       <bean id="testResult2"
+               parent="slcDefault.test.basicTreeTestResult">
+               <property name="listeners">
+                       <list merge="true">
+                               <ref
+                                       bean="exampleDefault.ws.client.treeTestResultWsNotfier" />
+                       </list>
+               </property>
+       </bean>
+
+       <bean name="executionBuildListener"
+               class="org.argeo.slc.ant.SlcExecutionBuildListener">
+               <property name="logLevel" value="INFO" />
+               <property name="notifiers">
+                       <list>
+                               <ref
+                                       bean="exampleDefault.ws.client.slcExecutionNotifier" />
+                       </list>
+               </property>
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/src/main/slc/conf/slc.properties b/org.argeo.slc.example/src/main/slc/conf/slc.properties
index 8968a546626c22f86cffd66fa1fb808eeba2488a..af47c9efb55bd512d1ad9feb0a6ea551a794ce1a 100644 (file)
--- a/org.argeo.slc.example/src/main/slc/conf/slc.properties
+++ b/org.argeo.slc.example/src/main/slc/conf/slc.properties
@@ -1,4 +1,7 @@
-rootTest=TEST
+example.testMessage=PROPERTIES ARE PROPERLY READ
+
+# Web Service
+slc.ws.uri=http://localhost:9090/org.argeo.slc.webapp/slcService/
 
 # Log4j additional config
 #log4j.logger.org.argeo.slc=DEBUG

diff --git a/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
index 9d98053b2329dc308252ba9f631023c1c6ae0bb3..88f8c6c75913c791e822ca8a63aaf3d194a5d838 100644 (file)
--- a/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/src/main/slc/root/Category1/SubCategory2/build.xml
@@ -3,13 +3,16 @@
 \r
        <import file="complex.xml" />\r
 \r
-       <target name="test" depends="testSimple,testComplex,testError">\r
+       <target name="test" depends="testSimple,testComplex,testError">
+               <echo message="${example.testMessage}" />
+               <!--
                <slc.closeResult>
                        <result bean="testResult" />
                </slc.closeResult>
                <slc.closeResult>
                        <result bean="testResult2" />
                </slc.closeResult>
+               -->
        </target>\r
 \r
        <target name="testSimple" description="Simple tests">\r