From 0c00e8136e03fd9fe2e76ed87be3baca61dd52a3 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 21 Jun 2008 11:59:06 +0000
Subject: [PATCH] Restructure example Improve logging

git-svn-id: https://svn.argeo.org/slc/trunk@1258 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../conf/applicationContext.xml               | 12 ++--
 .../exampleSlcAppli/conf/data.xml             | 14 ----
 .../conf/environments/environments.xml        | 18 +++++
 .../exampleSlcAppli/conf/execution.xml        | 45 ------------
 .../exampleSlcAppli/conf/log4j.properties     | 22 ------
 .../exampleSlcAppli/conf/runtime/default.xml  | 52 ++++++++++++++
 .../exampleSlcAppli/conf/slc.properties       |  5 +-
 .../exampleSlcAppli/conf/slc.xml              | 71 -------------------
 .../conf/{ => test}/contextTests.xml          |  0
 .../conf/{ => test}/testDatas.xml             |  0
 .../conf/{ => test}/testDefinitions.xml       |  0
 .../root/Category1/SubCategory2/build.xml     |  1 -
 .../src/test/java/log4j.properties            | 27 -------
 .../org/argeo/slc/example/ExecutionTest.java  |  3 +-
 14 files changed, 82 insertions(+), 188 deletions(-)
 delete mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/data.xml
 create mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml
 delete mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/execution.xml
 delete mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
 create mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
 delete mode 100644 org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
 rename org.argeo.slc.example/exampleSlcAppli/conf/{ => test}/contextTests.xml (100%)
 rename org.argeo.slc.example/exampleSlcAppli/conf/{ => test}/testDatas.xml (100%)
 rename org.argeo.slc.example/exampleSlcAppli/conf/{ => test}/testDefinitions.xml (100%)
 delete mode 100644 org.argeo.slc.example/src/test/java/log4j.properties

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
index 46cbe07ea..73c83fbec 100644
--- a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
@@ -3,10 +3,10 @@
 	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.0.xsd">
 
-	<import resource="data.xml" />
-	<import resource="slc.xml" />
-	<import resource="testDatas.xml" />
-	<import resource="testDefinitions.xml" />
-	<import resource="contextTests.xml" />
-	<import resource="execution.xml" />
+	<import resource="runtime/default.xml" />
+	<import resource="environments/environments.xml" />
+
+	<import resource="test/testDatas.xml" />
+	<import resource="test/testDefinitions.xml" />
+	<import resource="test/contextTests.xml" />
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/data.xml b/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
deleted file mode 100644
index 7f9664d9d..000000000
--- a/org.argeo.slc.example/exampleSlcAppli/conf/data.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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.0.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-
-	<bean id="testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TestResultDaoHibernate">
-		<property name="sessionFactory"
-			ref="slcDefault.sessionFactory.hibernateTestHSQL" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml b/org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml
new file mode 100644
index 000000000..ab08c2f7d
--- /dev/null
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/environments/environments.xml
@@ -0,0 +1,18 @@
+<?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">
+
+	<bean id="exampleDeployedSystem"
+		class="org.argeo.slc.example.ExampleDeployedSystem">
+		<property name="skipFreq" value="2" />
+		<property name="deployedSystemId" value="123456" />
+	</bean>
+
+	<bean id="exampleDeployedSystem2"
+		class="org.argeo.slc.example.ExampleDeployedSystem">
+		<property name="skipFreq" value="3" />
+		<property name="deployedSystemId" value="654321" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/execution.xml b/org.argeo.slc.example/exampleSlcAppli/conf/execution.xml
deleted file mode 100644
index bcee4796f..000000000
--- a/org.argeo.slc.example/exampleSlcAppli/conf/execution.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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">
-
-	<bean name="executionBuildListener"
-		class="org.argeo.slc.ant.SlcExecutionBuildListener">
-		<property name="notifiers">
-			<list>
-				<ref bean="fileNotifier" />
-				<!-- <ref bean="webServiceNotifier" />-->
-			</list>
-		</property>
-	</bean>
-
-	<bean id="marshaller"
-		class="org.springframework.oxm.castor.CastorMarshaller">
-		<property name="mappingLocation"
-			value="classpath:org/argeo/slc/castor/process/mapping.xml" />
-	</bean>
-
-	<bean name="fileNotifier"
-		class="org.argeo.slc.core.process.FileSlcExecutionNotifier">
-		<property name="basePath" value="${slc.workDir}/process" />
-		<property name="marshaller" ref="marshaller" />
-	</bean>
-<!-- 
-	<bean name="webServiceNotifier"
-		class="org.argeo.slc.core.process.WebServiceSlcExecutionNotifier">
-		<property name="template" ref="webServiceTemplate" />
-	</bean>
-
-	<bean id="webServiceTemplate"
-		class="org.springframework.ws.client.core.WebServiceTemplate">
-		<constructor-arg ref="messageFactory" />
-		<property name="marshaller" ref="marshaller"/>
-		<property name="unmarshaller" ref="marshaller"/>
-		<property name="defaultUri"
-			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
-	</bean>
-
-	<bean id="messageFactory"
-		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
--->
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties b/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
deleted file mode 100644
index e0c9e3556..000000000
--- a/org.argeo.slc.example/exampleSlcAppli/conf/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, console
-
-## Levels
-# Slc
-log4j.logger.org.argeo.slc=INFO
-# Spring
-log4j.logger.org.springframework=INFO
-# Hibernate
-log4j.logger.org.hibernate=WARN
-#log4j.logger.org.hibernate.SQL=DEBUG
-#log4j.logger.org.hibernate.type=TRACE
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
-
-## Appenders
-# A1 is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml b/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
new file mode 100644
index 000000000..7764b7012
--- /dev/null
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
@@ -0,0 +1,52 @@
+<?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/core/test/spring/applicationContext.xml" />
+	<import
+		resource="classpath:/org/argeo/slc/core/process/spring/applicationContext.xml" />
+
+	<bean id="defaultTestRun"
+		class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
+		<property name="testResult" ref="testResult" />
+		<property name="deployedSystem" ref="exampleDeployedSystem" />
+	</bean>
+
+	<bean id="otherTestRun"
+		class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
+		<property name="testResult" ref="testResult2" />
+		<property name="deployedSystem" ref="exampleDeployedSystem" />
+	</bean>
+
+	<bean id="testResult"
+		class="org.argeo.slc.core.test.tree.TreeTestResult">
+		<property name="uuid" value="1" />
+		<property name="listeners">
+			<list>
+				<ref bean="slcDefault.test.resultLogger" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="testResult2"
+		class="org.argeo.slc.core.test.tree.TreeTestResult">
+		<property name="uuid" value="2" />
+		<property name="listeners">
+			<list>
+				<ref bean="slcDefault.test.resultLogger" />
+			</list>
+		</property>
+	</bean>
+
+	<bean name="executionBuildListener"
+		class="org.argeo.slc.ant.SlcExecutionBuildListener">
+		<property name="notifiers">
+			<list>
+				<ref bean="slcDefault.process.fileSlcExecutionNotifier" />
+				<!-- <ref bean="webServiceNotifier" />-->
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/slc.properties b/org.argeo.slc.example/exampleSlcAppli/conf/slc.properties
index d5378cb7f..8968a5466 100644
--- a/org.argeo.slc.example/exampleSlcAppli/conf/slc.properties
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/slc.properties
@@ -1 +1,4 @@
-rootTest=TEST
\ No newline at end of file
+rootTest=TEST
+
+# Log4j additional config
+#log4j.logger.org.argeo.slc=DEBUG
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml b/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
deleted file mode 100644
index 821739501..000000000
--- a/org.argeo.slc.example/exampleSlcAppli/conf/slc.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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.0.xsd">
-
-	<bean id="defaultTestRun"
-		class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
-		<property name="testResult" ref="testResult" />
-		<property name="deployedSystem" ref="exampleDeployedSystem" />
-	</bean>
-
-	<bean id="otherTestRun"
-		class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
-		<property name="testResult" ref="testResult2" />
-		<property name="deployedSystem" ref="exampleDeployedSystem" />
-	</bean>
-
-	<bean id="testResult"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid" value="1" />
-		<property name="listeners">
-			<list>
-				<ref bean="resultLogger" />
-				<ref bean="resultPersister" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="testResult2"
-		class="org.argeo.slc.core.test.tree.TreeTestResult">
-		<property name="uuid" value="2" />
-		<property name="listeners">
-			<list>
-				<ref bean="resultLogger" />
-				<ref bean="resultPersister" />
-			</list>
-		</property>
-	</bean>
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
-	<bean id="resultLogger"
-		class="org.argeo.slc.core.test.tree.TreeTestResultLogger">
-	</bean>
-
-	<bean id="resultPersister"
-		class="org.argeo.slc.dao.test.tree.TreeTestResultPersister">
-		<property name="testResultDao" ref="testResultDao" />
-	</bean>
-
-	<bean id="report"
-		class="org.argeo.slc.core.test.tree.htmlreport.FullHtmlTreeReport">
-		<property name="testResultDao" ref="testResultDao" />
-		<property name="reportDir"
-			value="${slc.workDir}/results/report" />
-	</bean>
-
-	<bean id="exampleDeployedSystem"
-		class="org.argeo.slc.example.ExampleDeployedSystem">
-		<property name="skipFreq" value="2" />
-		<property name="deployedSystemId" value="123456"/>
-	</bean>
-
-	<bean id="exampleDeployedSystem2"
-		class="org.argeo.slc.example.ExampleDeployedSystem">
-		<property name="skipFreq" value="3" />
-		<property name="deployedSystemId" value="654321"/>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/contextTests.xml b/org.argeo.slc.example/exampleSlcAppli/conf/test/contextTests.xml
similarity index 100%
rename from org.argeo.slc.example/exampleSlcAppli/conf/contextTests.xml
rename to org.argeo.slc.example/exampleSlcAppli/conf/test/contextTests.xml
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml b/org.argeo.slc.example/exampleSlcAppli/conf/test/testDatas.xml
similarity index 100%
rename from org.argeo.slc.example/exampleSlcAppli/conf/testDatas.xml
rename to org.argeo.slc.example/exampleSlcAppli/conf/test/testDatas.xml
diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml b/org.argeo.slc.example/exampleSlcAppli/conf/test/testDefinitions.xml
similarity index 100%
rename from org.argeo.slc.example/exampleSlcAppli/conf/testDefinitions.xml
rename to org.argeo.slc.example/exampleSlcAppli/conf/test/testDefinitions.xml
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 924d906fc..9d98053b2 100644
--- a/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml
@@ -10,7 +10,6 @@
 		<slc.closeResult>
 			<result bean="testResult2" />
 		</slc.closeResult>
-		<slc.report report="report" />
 	</target>
 
 	<target name="testSimple" description="Simple tests">
diff --git a/org.argeo.slc.example/src/test/java/log4j.properties b/org.argeo.slc.example/src/test/java/log4j.properties
deleted file mode 100644
index 0ee57f2cf..000000000
--- a/org.argeo.slc.example/src/test/java/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, console
-
-## Levels
-# Slc
-log4j.logger.org.argeo=TRACE
-
-# Castor
-log4j.logger.org.exolab.castor=WARN
-
-# Spring
-log4j.logger.org.springframework=INFO
-# Hibernate
-log4j.logger.org.hibernate=WARN
-#log4j.logger.org.hibernate.SQL=TRACE
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
-#log4j.logger.org.hibernate.type=TRACE
-
-
-## Appenders
-# A1 is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
index bd77b4d3d..0de1435d0 100644
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
@@ -10,7 +10,8 @@ public class ExecutionTest extends TestCase {
 				"--mode",
 				"single",
 				"--script",
-				"/home/mbaudier/workspace/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml" };
+				"/home/mbaudier/workspace/org.argeo.slc.example/exampleSlcAppli/root/Category1/SubCategory2/build.xml",
+				"-p", "log4j.logger.org.argeo.slc=WARN" };
 		SlcMain.main(args);
 	}
 }
-- 
2.39.5