Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1144:38b81f8c14b4

Timestamp:

06/04/10 17:22:34 (3 years ago)

Author:

Thomas Gambet <tgambet@…>

Branch:

default

Children:

1145:e4143766ccb9, 1147:2bff71d7c5aa

Parents:

1143:c03f236e87a5 (diff), 1135:3e0cd51de01a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 3e0cd51de01a219e32f9d1c854c0d2ec7624611e

Location:

WebContent/WEB-INF/conf

Files:

: 4 modified

log4j.xml (modified) (3 diffs)
log4j.xml (modified) (3 diffs)
observers.list (modified) (1 diff)
observers.list (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

WebContent/WEB-INF/conf/log4j.xml

r603	r1144
10	10
11	11	<appender name="console" class="org.apache.log4j.ConsoleAppender">
12		<param name="Threshold" value="~~trace~~" />
	12	<param name="Threshold" value="info" />
13	13	<layout class="org.apache.log4j.PatternLayout">
14	14	<param name="ConversionPattern" value="%-5p (%F:%L) : %m%n" />
…	…
178	178	<logger name="org.apache.velocity">
179	179	<level value="debug"/>
180		<~~appender-ref ref="velocity_log" /~~>
	180	<!-- <appender-ref ref="velocity_log" /> -->
181	181	</logger>
182	182
183	183	<logger name="org.w3c.unicorn.Framework">
184		<level value="~~debug~~"/>
	184	<level value="trace"/>
185	185	</logger>
186	186
187	187	<logger name="org.w3c.unicorn">
188	188	<level value="debug"/>
189		<~~appender-ref ref="package-unicorn" /~~>
190		</logger>
191
192		<logger name="org.w3c.unicorn.action">
	189	<!-- <appender-ref ref="package-unicorn" /> -->
	190	</logger>
	191
	192	<!-- <logger name="org.w3c.unicorn.action">
193	193	<appender-ref ref="package-action" />
194	194	</logger>
…	…
224	224	<logger name="org.w3c.unicorn.util">
225	225	<appender-ref ref="package-util" />
226		</logger>
	226	</logger> -->
227	227
228	228	<root>
229	229	<level value="all"/>
230		<appender-ref ref="level-error" />
	230	<!-- <appender-ref ref="level-error" />
231	231	<appender-ref ref="level-warning" />
232	232	<appender-ref ref="level-info" />
233	233	<appender-ref ref="level-debug" />
234		<appender-ref ref="level-trace" />
	234	<appender-ref ref="level-trace" /> -->
235	235	<appender-ref ref="console" />
236		<~~!-- <appender-ref ref="gui" /> --~~>
	236	<appender-ref ref="gui" />
237	237	</root>
238	238

WebContent/WEB-INF/conf/log4j.xml

r603	r1144
10	10
11	11	<appender name="console" class="org.apache.log4j.ConsoleAppender">
12		<param name="Threshold" value="~~trace~~" />
	12	<param name="Threshold" value="info" />
13	13	<layout class="org.apache.log4j.PatternLayout">
14	14	<param name="ConversionPattern" value="%-5p (%F:%L) : %m%n" />
…	…
178	178	<logger name="org.apache.velocity">
179	179	<level value="debug"/>
180		<~~appender-ref ref="velocity_log" /~~>
	180	<!-- <appender-ref ref="velocity_log" /> -->
181	181	</logger>
182	182
183	183	<logger name="org.w3c.unicorn.Framework">
184		<level value="~~debug~~"/>
	184	<level value="trace"/>
185	185	</logger>
186	186
187	187	<logger name="org.w3c.unicorn">
188	188	<level value="debug"/>
189		<~~appender-ref ref="package-unicorn" /~~>
190		</logger>
191
192		<logger name="org.w3c.unicorn.action">
	189	<!-- <appender-ref ref="package-unicorn" /> -->
	190	</logger>
	191
	192	<!-- <logger name="org.w3c.unicorn.action">
193	193	<appender-ref ref="package-action" />
194	194	</logger>
…	…
224	224	<logger name="org.w3c.unicorn.util">
225	225	<appender-ref ref="package-util" />
226		</logger>
	226	</logger> -->
227	227
228	228	<root>
229	229	<level value="all"/>
230		<appender-ref ref="level-error" />
	230	<!-- <appender-ref ref="level-error" />
231	231	<appender-ref ref="level-warning" />
232	232	<appender-ref ref="level-info" />
233	233	<appender-ref ref="level-debug" />
234		<appender-ref ref="level-trace" />
	234	<appender-ref ref="level-trace" /> -->
235	235	<appender-ref ref="console" />
236		<~~!-- <appender-ref ref="gui" /> --~~>
	236	<appender-ref ref="gui" />
237	237	</root>
238	238

WebContent/WEB-INF/conf/observers.list

r1099	r1144
1		http://qa-dev.w3.org/~ot/ucn_contracts/css-validator.wadl
2		http://qa-dev.w3.org/~ot/ucn_contracts/markup-validator.wadl
3		http://qa-dev.w3.org/~ot/ucn_contracts/appc-checker-validator.wadl
4		http://qa-dev.w3.org/~ot/ucn_contracts/css1.wadl
5		http://qa-dev.w3.org/~ot/ucn_contracts/css2.wadl
6		http://qa-dev.w3.org/~ot/ucn_contracts/css3.wadl
7		http://qa-dev.w3.org/~ot/ucn_contracts/css21.wadl
8		http://qa-dev.w3.org/~ot/ucn_contracts/mobileOk.wadl
9		http://qa-dev.w3.org/~ot/ucn_contracts/test.wadl
	1	#http://qa-dev.w3.org/~ot/ucn_contracts/css-validator.wadl
	2	#http://qa-dev.w3.org/~ot/ucn_contracts/markup-validator.wadl
	3	#http://qa-dev.w3.org/~ot/ucn_contracts/appc-checker-validator.wadl
	4	#http://qa-dev.w3.org/~ot/ucn_contracts/css1.wadl
	5	#http://qa-dev.w3.org/~ot/ucn_contracts/css2.wadl
	6	#http://qa-dev.w3.org/~ot/ucn_contracts/css3.wadl
	7	#http://qa-dev.w3.org/~ot/ucn_contracts/css21.wadl
	8	#http://qa-dev.w3.org/~ot/ucn_contracts/mobileOk.wadl
	9	#http://qa-dev.w3.org/~ot/ucn_contracts/test.wadl
	10	#http://qa-dev.w3.org/~ot/ucn_contracts/feed-validator.wadl
10	11	http://qa-dev.w3.org:8008/cssval/api.wadl
	12
	13	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css-validator.wadl
	14	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/appc-checker-validator.wadl
	15	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/markup-validator.wadl
	16	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css1.wadl
	17	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css2.wadl
	18	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css3.wadl
	19	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css21.wadl
	20	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/mobileOk.wadl
	21	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/test.wadl
	22	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/feed-validator.wadl

WebContent/WEB-INF/conf/observers.list

r1139	r1144
1		http://qa-dev.w3.org/~ot/ucn_contracts/css-validator.wadl
2		http://qa-dev.w3.org/~ot/ucn_contracts/markup-validator.wadl
3		http://qa-dev.w3.org/~ot/ucn_contracts/appc-checker-validator.wadl
4		http://qa-dev.w3.org/~ot/ucn_contracts/css1.wadl
5		http://qa-dev.w3.org/~ot/ucn_contracts/css2.wadl
6		http://qa-dev.w3.org/~ot/ucn_contracts/css3.wadl
7		http://qa-dev.w3.org/~ot/ucn_contracts/css21.wadl
8		http://qa-dev.w3.org/~ot/ucn_contracts/mobileOk.wadl
9		http://qa-dev.w3.org/~ot/ucn_contracts/test.wadl
10		http://qa-dev.w3.org/~ot/ucn_contracts/feed-validator.wadl
	1	#http://qa-dev.w3.org/~ot/ucn_contracts/css-validator.wadl
	2	#http://qa-dev.w3.org/~ot/ucn_contracts/markup-validator.wadl
	3	#http://qa-dev.w3.org/~ot/ucn_contracts/appc-checker-validator.wadl
	4	#http://qa-dev.w3.org/~ot/ucn_contracts/css1.wadl
	5	#http://qa-dev.w3.org/~ot/ucn_contracts/css2.wadl
	6	#http://qa-dev.w3.org/~ot/ucn_contracts/css3.wadl
	7	#http://qa-dev.w3.org/~ot/ucn_contracts/css21.wadl
	8	#http://qa-dev.w3.org/~ot/ucn_contracts/mobileOk.wadl
	9	#http://qa-dev.w3.org/~ot/ucn_contracts/test.wadl
	10	#http://qa-dev.w3.org/~ot/ucn_contracts/feed-validator.wadl
11	11	http://qa-dev.w3.org:8008/cssval/api.wadl
	12
	13	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css-validator.wadl
	14	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/appc-checker-validator.wadl
	15	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/markup-validator.wadl
	16	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css1.wadl
	17	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css2.wadl
	18	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css3.wadl
	19	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/css21.wadl
	20	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/mobileOk.wadl
	21	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/test.wadl
	22	file:///D:/Documents/Projets/Workspace/unicorn/WebContent/WEB-INF/resources/contracts/feed-validator.wadl

Unicorn - W3C's Unified Validator

Context Navigation

Changeset 1144:38b81f8c14b4

Legend:

WebContent/WEB-INF/conf/log4j.xml

WebContent/WEB-INF/conf/log4j.xml

WebContent/WEB-INF/conf/observers.list

WebContent/WEB-INF/conf/observers.list

Download in other formats: