Strabon

changeset 296:581e52ae22a0

find changesets by author, revision, files, or words in the commit message
merged successfully
author Manos Karpathiotakis <mk@di.uoa.gr>
date Tue Jun 19 17:45:18 2012 +0300 (2012-06-19)
parents ac3e112e7478 f68dd3a4aa8b
children 36acd78a9455
files runtime/log4j.properties
line diff
     1.1 --- a/evaluation/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     1.2 +++ b/evaluation/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     1.3 @@ -32,26 +32,10 @@
     1.4  
     1.5  		<dependency>
     1.6  			<groupId>org.slf4j</groupId>
     1.7 -			<artifactId>slf4j-api</artifactId>
     1.8 -		</dependency>
     1.9 -
    1.10 -		<!-- 
    1.11 -		<dependency>
    1.12 -			<groupId>org.slf4j</groupId>
    1.13 -			<artifactId>slf4j-simple</artifactId>
    1.14 -		</dependency>
    1.15 -		-->
    1.16 -		<dependency>
    1.17 -			<groupId>org.slf4j</groupId>
    1.18  			<artifactId>slf4j-log4j12</artifactId>
    1.19  		</dependency>
    1.20  
    1.21  		<dependency>
    1.22 -			<groupId>log4j</groupId>
    1.23 -			<artifactId>log4j</artifactId>
    1.24 -		</dependency>
    1.25 -
    1.26 -		<dependency>
    1.27  			<groupId>junit</groupId>
    1.28  			<artifactId>junit</artifactId>
    1.29  		</dependency>

     2.1 --- a/generaldb/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     2.2 +++ b/generaldb/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     2.3 @@ -63,11 +63,6 @@
     2.4  		</dependency>
     2.5  
     2.6  		<dependency>
     2.7 -			<groupId>org.slf4j</groupId>
     2.8 -			<artifactId>slf4j-api</artifactId>
     2.9 -		</dependency>
    2.10 -
    2.11 -		<dependency>
    2.12  			<groupId>commons-dbcp</groupId>
    2.13  			<artifactId>commons-dbcp</artifactId>
    2.14  		</dependency>

     3.1 --- a/monetdb/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     3.2 +++ b/monetdb/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     3.3 @@ -67,11 +67,6 @@
     3.4  		</dependency>
     3.5  
     3.6  		<dependency>
     3.7 -			<groupId>org.slf4j</groupId>
     3.8 -			<artifactId>slf4j-api</artifactId>
     3.9 -		</dependency>
    3.10 -
    3.11 -		<dependency>
    3.12  			<groupId>commons-dbcp</groupId>
    3.13  			<artifactId>commons-dbcp</artifactId>
    3.14  		</dependency>

     4.1 --- a/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     4.2 +++ b/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     4.3 @@ -33,7 +33,6 @@
     4.4  		<sesame.version>2.6.3</sesame.version>
     4.5  		<aduna.appbase.version>3.5.0</aduna.appbase.version>
     4.6  		<slf4j.version>1.6.4</slf4j.version>
     4.7 -		<log4j.version>1.2.17</log4j.version>
     4.8  		<spring.version>2.5.6</spring.version>
     4.9  		<jts.version>1.11</jts.version>
    4.10  		<geotools.version>2.7.4</geotools.version>
    4.11 @@ -318,21 +317,6 @@
    4.12  				<version>5.1.15</version>
    4.13  			</dependency>
    4.14  
    4.15 -			<!-- SLF4J -->
    4.16 -			<dependency>
    4.17 -				<groupId>org.slf4j</groupId>
    4.18 -				<artifactId>slf4j-api</artifactId>
    4.19 -				<version>${slf4j.version}</version>
    4.20 -			</dependency>
    4.21 -
    4.22 -			<!-- 
    4.23 -			<dependency>
    4.24 -				<groupId>org.slf4j</groupId>
    4.25 -				<artifactId>slf4j-simple</artifactId>
    4.26 -				<version>${slf4j.version}</version>
    4.27 -			</dependency>
    4.28 -   			-->
    4.29 -   			
    4.30  			<dependency>
    4.31  				<groupId>net.sf</groupId>
    4.32  				<artifactId>log4jdbc4</artifactId>
    4.33 @@ -346,13 +330,6 @@
    4.34  				<version>${slf4j.version}</version>
    4.35  			</dependency>
    4.36  			
    4.37 -			<dependency>
    4.38 -				<groupId>log4j</groupId>
    4.39 -				<artifactId>log4j</artifactId>
    4.40 -				<version>${log4j.version}</version>
    4.41 -			</dependency>
    4.42 -			            
    4.43 -			
    4.44  			<!-- Apache Commons -->
    4.45  			<dependency>
    4.46  				<groupId>commons-cli</groupId>

     5.1 --- a/postgis/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     5.2 +++ b/postgis/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     5.3 @@ -67,11 +67,6 @@
     5.4  		</dependency>
     5.5  
     5.6  		<dependency>
     5.7 -			<groupId>org.slf4j</groupId>
     5.8 -			<artifactId>slf4j-api</artifactId>
     5.9 -		</dependency>
    5.10 -
    5.11 -		<dependency>
    5.12  			<groupId>commons-dbcp</groupId>
    5.13  			<artifactId>commons-dbcp</artifactId>
    5.14  		</dependency>

     6.1 --- a/resultio/pom.xml	Tue Jun 19 17:45:02 2012 +0300
     6.2 +++ b/resultio/pom.xml	Tue Jun 19 17:45:18 2012 +0300
     6.3 @@ -49,24 +49,8 @@
     6.4  
     6.5  		<dependency>
     6.6  			<groupId>org.slf4j</groupId>
     6.7 -			<artifactId>slf4j-api</artifactId>
     6.8 -		</dependency>
     6.9 -		
    6.10 -		<!-- 		
    6.11 -		<dependency>
    6.12 -			<groupId>org.slf4j</groupId>
    6.13 -			<artifactId>slf4j-simple</artifactId>
    6.14 -		</dependency>
    6.15 -		-->
    6.16 -		<dependency>
    6.17 -			<groupId>org.slf4j</groupId>
    6.18  			<artifactId>slf4j-log4j12</artifactId>
    6.19  		</dependency>
    6.20 -
    6.21 -		<dependency>
    6.22 -			<groupId>log4j</groupId>
    6.23 -			<artifactId>log4j</artifactId>
    6.24 -		</dependency>
    6.25  		
    6.26  		<dependency>
    6.27  			<groupId>junit</groupId>

     7.1 --- a/runtime/log4j.properties	Tue Jun 19 17:45:02 2012 +0300
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,22 +0,0 @@
     7.4 -# logger level values: OFF, ERROR, WARN, INFO, DEBUG, ALL
     7.5 -log4j.rootLogger=OFF, CA
     7.6 -#log4j.rootLogger=DEBUG, CA
     7.7 -#log4j.rootLogger=INFO, CA, FA
     7.8 -
     7.9 -# Console Appender
    7.10 -log4j.appender.CA=org.apache.log4j.ConsoleAppender
    7.11 -log4j.appender.CA.layout=org.apache.log4j.PatternLayout
    7.12 -log4j.appender.CA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
    7.13 -
    7.14 -# File Appender
    7.15 -#log4j.appender.FA=org.apache.log4j.FileAppender
    7.16 -#log4j.appender.FA.File=sample.log
    7.17 -#log4j.appender.FA.layout=org.apache.log4j.PatternLayout
    7.18 -#log4j.appender.FA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
    7.19 -# Set the logger level of File Appender to WARN
    7.20 -#log4j.appender.FA.Threshold = WARN
    7.21 -
    7.22 -
    7.23 -# Sesame configuration (debug only Strabon)
    7.24 -log4j.logger.org.openrdf.query.parser.QueryParserRegistry=INFO
    7.25 -log4j.logger.org.openrdf.sail.generaldb.managers.TripleTableManager=INFO

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/runtime/src/main/resources/log4j.properties	Tue Jun 19 17:45:18 2012 +0300
     8.3 @@ -0,0 +1,22 @@
     8.4 +# logger level values: OFF, ERROR, WARN, INFO, DEBUG, ALL
     8.5 +log4j.rootLogger=OFF, CA
     8.6 +#log4j.rootLogger=DEBUG, CA
     8.7 +#log4j.rootLogger=INFO, CA, FA
     8.8 +
     8.9 +# Console Appender
    8.10 +log4j.appender.CA=org.apache.log4j.ConsoleAppender
    8.11 +log4j.appender.CA.layout=org.apache.log4j.PatternLayout
    8.12 +log4j.appender.CA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
    8.13 +
    8.14 +# File Appender
    8.15 +#log4j.appender.FA=org.apache.log4j.FileAppender
    8.16 +#log4j.appender.FA.File=sample.log
    8.17 +#log4j.appender.FA.layout=org.apache.log4j.PatternLayout
    8.18 +#log4j.appender.FA.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
    8.19 +# Set the logger level of File Appender to WARN
    8.20 +#log4j.appender.FA.Threshold = WARN
    8.21 +
    8.22 +
    8.23 +# Sesame configuration (debug only Strabon)
    8.24 +log4j.logger.org.openrdf.query.parser.QueryParserRegistry=INFO
    8.25 +log4j.logger.org.openrdf.sail.generaldb.managers.TripleTableManager=INFO