Project

General

Profile

« Previous | Next » 

Revision 282212d6

Added by Andreas Müller over 1 year ago

ref 10072 remove log4j12 and apache-log4j-extras from taxeditor and adapt log4j properties

View differences:

.gitattributes
168 168
eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
169 169
eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
170 170
eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text
171
eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.17.jar -text
172 171
eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar -text
173 172
eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
174 173
eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-java-0.8.7.jar -text
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
386 386
 org.eclipse.e4.ui.services;bundle-version="1.2.100",
387 387
 org.eclipse.swt
388 388
Bundle-ClassPath: .,
389
 lib/apache-log4j-extras-1.2.17.jar,
390 389
 lib/aspectjweaver-1.9.7.jar,
391 390
 lib/aspectjrt-1.9.7.jar,
392 391
 lib/cdmlib-commons-5.32.0-SNAPSHOT.jar,
......
428 427
 lib/jdom-1.1.3.jar,
429 428
 lib/jdom2-2.0.6.jar,
430 429
 lib/joda-time-2.10.14.jar,
431
 lib/log4j-1.2.17.jar,
432 430
 lib/log4j-api-2.17.2.jar,
433 431
 lib/log4j-core-2.17.2.jar,
434 432
 lib/lsid-client-1.1.2.jar,
eu.etaxonomy.taxeditor.cdmlib/build.properties
39 39
               lib/jboss-logging-3.4.3.Final.jar,\
40 40
               lib/jdom-1.1.3.jar,\
41 41
               lib/joda-time-2.10.14.jar,\
42
               lib/log4j-1.2.17.jar,\
43 42
               lib/log4j-api-2.17.2.jar,\
44 43
 			   lib/log4j-core-2.17.2.jar,\
45 44
               lib/lsid-client-1.1.2.jar,\
eu.etaxonomy.taxeditor.cdmlib/pom.xml
83 83
                poi,poi-ooxml,poi-ooxml-schemas,xmlbeans,commons-collections4,commons-math3,
84 84
                c3p0,mchange-commons-java,
85 85
                opencsv,joda-time,usertype.core,
86
                apache-log4j-extras,
87 86
                h2,mysql-connector-java,postgresql,
88 87
                junit,hamcrest-core,commons-dbcp,commons-pool,
89 88
                jboss-transaction-api_1.2_spec
......
305 304
      <artifactId>commons-codec</artifactId>
306 305
      <version>1.15</version>
307 306
    </dependency>
308
    <dependency>
309
      <!-- TODO adapt TaxEditor code to log4j2, then this can be removed -->
310
      <groupId>log4j</groupId>
311
      <artifactId>log4j</artifactId>
312
      <version>1.2.17</version>
313
    </dependency>
314 307
    <dependency>
315 308
      <!-- CdmServiceCacher -->
316 309
      <groupId>org.apache.logging.log4j</groupId>
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/log4j.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
3
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
4
  debug="false">
5
  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
6
    <param name="Target" value="System.out" />
7
    <layout class="org.apache.log4j.PatternLayout">
8
      <param name="ConversionPattern" value="%d %p [%c] - %m%n" />
9
    </layout>
10
    <filter class="org.apache.log4j.filter.ExpressionFilter">
11
      <param name="expression"
12
        value="msg like  '.*has a maxElementsInMemory of 0. This might lead to performance degradation or OutOfMemoryError at Terracotta client.*'" />
13
      <param name="acceptOnMatch" value="false" />
14
    </filter>
15
    <filter class="org.apache.log4j.filter.ExpressionFilter">
16
      <param name="expression"
17
        value="msg like  '.*object references was reached while attempting to calculate the size of the object graph.*'" />
18
      <param name="acceptOnMatch" value="false" />
19
    </filter>
20
  </appender>
21
  <appender name="A1" class="org.apache.log4j.FileAppender">
22
    <param name="File"   value="A1.log" />
23
    <param name="Append" value="true" />
24
    <layout class="org.apache.log4j.xml.XMLLayout" />
25
  </appender>
26
  <root>
27
    <priority value="WARN" />
28
    <appender-ref ref="A1" />
29
  </root>
30
<!--  <logger name="org.hibernate.proxy.AbstractLazyInitializer"> -->
31
<!--    <level value="info" /> -->
32
<!--  </logger> -->
33
<!--  <logger -->
34
<!--     name="org.hibernate.collection.internal.AbstractPersistentCollection"> -->
35
<!--     <level value="info" /> -->
36
<!--   </logger> -->
37
<!--   <logger -->
38
<!--     name="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor"> -->
39
<!--     <level value="info" /> -->
40
<!--   </logger> -->
41
<!--   <logger -->
42
<!--     name="eu.etaxonomy.taxeditor.session.DefaultNewEntityListener"> -->
43
<!--     <level value="info" /> -->
44
<!--   </logger> -->
45
   <logger name="eu.etaxonomy.taxeditor.handler.update.UpdateHandler"> 
46
     <level value="info" />  
47
   </logger>  
48
   <logger name="org.eclipse.equinox.p2.operations.ProvisioningSession"> 
49
     <level value="info" />  
50
   </logger>
51
   <logger name="org.eclipse.equinox.internal.p2.engine.ProvisioningPlan">
52
   	<level value="info" />  
53
   </logger>
54
</log4j:configuration>
2
<Configuration" status="WARN">
3
  <Appenders>
4
    <File name="A1" fileName="A1.log" append="true">
5
      <XMLLayout/>  <!-- maybe we need to add jackson-dataformat-xml dependency for this -->
6
    </File>
7
    <Console name="STDOUT" target="System.out">
8
      <PatternLayout  pattern="%d %p [%c] - %m%n"/>
9
      <Filters>
10
        <RegexFilter regex=".*has a maxElementsInMemory of 0. This might lead to performance degradation or OutOfMemoryError at Terracotta client.*"
11
          onMatch="DENY" onMismatch="NEUTRALonMis"/>
12
        <RegexFilter regex=".*object references was reached while attempting to calculate the size of the object graph.*"
13
          onMatch="DENY"/>
14
      </Filters>      
15
    </Console>
16
  </Appenders>
17
  <Loggers>
18
    <Root level="warn">
19
      <AppenderRef ref="A1"/>
20
      <!-- <AppenderRef ref="STDOUT"/> -->
21
    </Root>
22
    <Logger name="eu.etaxonomy.taxeditor.handler.update.UpdateHandler" level="info"/>
23
    <Logger name="org.eclipse.equinox.p2.operations.ProvisioningSession" level="info"/>
24
    <Logger name="org.eclipse.equinox.internal.p2.engine.ProvisioningPlan" level="info"/>
25
    
26
    <!-- ### NOT USED 
27
    <Logger name="org.hibernate.proxy.AbstractLazyInitializer" level="info"/>
28
    <Logger name="org.hibernate.collection.internal.AbstractPersistentCollection" level="info"/>
29
    <Logger name="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor" level="info"/>
30
    <Logger name="eu.etaxonomy.taxeditor.session.DefaultNewEntityListener" level="info"/>
31
     --> 
32
  </Loggers> 
33
</Configuration>
eu.etaxonomy.taxeditor.navigation/src/main/java/log4j.properties
1
### ************ APPENDER ***********************************###
2

  
3
### direct log messages to stdout ###
4
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
5
log4j.appender.stdout.Target=System.out
6
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
7
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
8

  
9
### direct messages to file hibernate.log ###
10
log4j.appender.file=org.apache.log4j.FileAppender
11
log4j.appender.file.File=taxeditor.log
12
log4j.appender.file.layout=org.apache.log4j.PatternLayout
13
log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
14

  
15
### ************* LOG LEVELS *********************************###
16

  
17
### set log levels - for more verbose logging change 'info' to 'debug' ###
18
### levels: error, warn, debug, info
19
log4j.rootLogger=INFO, stdout
20

  
21
### set directory-specific levels below
22
log4j.logger.eu.etaxonomy.taxeditor = DEBUG 
23

  
24

  
eu.etaxonomy.taxeditor.navigation/src/test/java/log4j.properties
1
### ************ APPENDER ***********************************###
2

  
3
### direct log messages to stdout ###
4
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
5
log4j.appender.stdout.Target=System.out
6
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
7
log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
8

  
9
### direct messages to file hibernate.log ###
10
log4j.appender.file=org.apache.log4j.FileAppender
11
log4j.appender.file.File=taxeditor.log
12
log4j.appender.file.layout=org.apache.log4j.PatternLayout
13
log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
14

  
15
### ************* LOG LEVELS *********************************###
16

  
17
### set log levels - for more verbose logging change 'info' to 'debug' ###
18
### levels: error, warn, debug, info
19
log4j.rootLogger=INFO, stdout
20

  
21
### set directory-specific levels below
22
log4j.logger.eu.etaxonomy.taxeditor = DEBUG 
23

  
24

  

Also available in: Unified diff