dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1831
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-05-09 14:59:49 +0200
message:
  - Removed ehcache-terracotta dependency (not needed)
  - Removed invalid properties for audit log in log4j setup
modified:
  dhis-2/dhis-support/dhis-support-hibernate/pom.xml
  dhis-2/dhis-support/dhis-support-test/pom.xml
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties
  dhis-2/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/pom.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-05-06 13:24:03 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/pom.xml	2010-05-09 12:59:49 +0000
@@ -42,10 +42,6 @@
       <artifactId>hibernate-entitymanager</artifactId>
     </dependency>
 
-    <!--dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-    </dependency-->
     <dependency>
       <groupId>geronimo-spec</groupId>
       <artifactId>geronimo-spec-jta</artifactId>
@@ -55,10 +51,6 @@
       <artifactId>ehcache-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-terracotta</artifactId>
-    </dependency>
-    <dependency>
       <groupId>c3p0</groupId>
       <artifactId>c3p0</artifactId>
     </dependency>

=== modified file 'dhis-2/dhis-support/dhis-support-test/pom.xml'
--- dhis-2/dhis-support/dhis-support-test/pom.xml	2010-05-04 11:36:35 +0000
+++ dhis-2/dhis-support/dhis-support-test/pom.xml	2010-05-09 12:59:49 +0000
@@ -40,10 +40,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    <!--dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-    </dependency-->
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties	2010-04-19 09:54:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties	2010-05-09 12:59:49 +0000
@@ -18,12 +18,10 @@
 log4j.appender.AUDIT=org.apache.log4j.DailyRollingFileAppender 
 log4j.appender.AUDIT.File= audit.log
 log4j.appender.AUDIT.DatePattern='.'yyyy-MM-dd
-log4j.appender.AUDIT.MaxFileSize = 100KB
-log4j.appender.AUDIT.MaxBackupIndex = 3
 log4j.appender.AUDIT.threshold=AUDIT_TRAIL#org.hisp.dhis.system.util.AuditLogLevel
 log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout
 log4j.appender.AUDIT.layout.ConversionPattern= * %-5p %d{ABSOLUTE} %m %n
 
 # Categories (order: DEBUG, INFO, WARN, ERROR, FATAL)
 log4j.rootCategory = WARN, console 
-log4j.category.org.hisp.dhis = INFO, AUDIT
\ No newline at end of file
+log4j.category.org.hisp.dhis = INFO, AUDIT

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2010-05-07 16:28:51 +0000
+++ dhis-2/pom.xml	2010-05-09 12:59:49 +0000
@@ -477,11 +477,6 @@
         <version>2.0.1</version>
       </dependency>
       <dependency>
-        <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache-terracotta</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
         <groupId>geronimo-spec</groupId>
         <artifactId>geronimo-spec-jta</artifactId>
         <version>1.0-M1</version>