SAK-30828 Normalize sakai logging

- remove commons-logging (jcl) - add logging to those projects where it was removed - convert System.out to log messages in many projects - add jcl-over-slf4j lib - update many dependencies to inherit from master - update logging for tests - add lombok to global dependency (@slf4j)
CoderSilence · Apr 23, 2016 · 8f39bf1 · 8f39bf1
1 parent 7e80d33
commit 8f39bf1
Show file tree

Hide file tree

Showing 366 changed files with 869 additions and 2,576 deletions.
diff --git a/access/access-impl/impl/pom.xml b/access/access-impl/impl/pom.xml
@@ -49,11 +49,6 @@
       <groupId>org.sakaiproject.velocity</groupId>
       <artifactId>sakai-velocity-tool</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${sakai.commons-logging.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/alias/alias-tool/tool/pom.xml b/alias/alias-tool/tool/pom.xml
@@ -33,10 +33,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject.velocity</groupId>
       <artifactId>sakai-velocity-tool-api</artifactId>

diff --git a/announcement/announcement-impl/impl/pom.xml b/announcement/announcement-impl/impl/pom.xml
@@ -36,10 +36,6 @@
             <groupId>org.sakaiproject.scheduler</groupId>
             <artifactId>scheduler-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/announcement/announcement-tool/tool/pom.xml b/announcement/announcement-tool/tool/pom.xml
@@ -68,10 +68,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -84,10 +80,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/archive/archive-tool/tool/pom.xml b/archive/archive-tool/tool/pom.xml
@@ -33,10 +33,6 @@
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>archive-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject.velocity</groupId>
       <artifactId>sakai-velocity-tool-api</artifactId>
@@ -53,10 +49,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

diff --git a/archive/import-handlers/announcement-handlers/pom.xml b/archive/import-handlers/announcement-handlers/pom.xml
@@ -24,10 +24,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-kernel-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>archive-api</artifactId>

diff --git a/archive/pom.xml b/archive/pom.xml
@@ -59,12 +59,6 @@
         <version>${project.version}</version>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>${sakai.lombok.version}</version>
-        <scope>provided</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>
diff --git a/assignment/assignment-impl/impl/pom.xml b/assignment/assignment-impl/impl/pom.xml
@@ -76,10 +76,6 @@
             <groupId>org.sakaiproject.taggable</groupId>
             <artifactId>sakai-taggable-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/assignment/assignment-impl/impl/src/test/resources/log4j.properties b/assignment/assignment-impl/impl/src/test/resources/log4j.properties
@@ -0,0 +1,6 @@
+log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n
+
+log4j.rootLogger=INFO,Stdout
+
diff --git a/assignment/assignment-tool/tool/pom.xml b/assignment/assignment-tool/tool/pom.xml
@@ -101,10 +101,6 @@
             <artifactId>ant</artifactId>
             <version>1.6.5</version>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -117,10 +113,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
     	<dependency>
             <groupId>org.sakaiproject.scheduler</groupId>
             <artifactId>scheduler-api</artifactId>

diff --git a/authz/authz-tool/tool/pom.xml b/authz/authz-tool/tool/pom.xml
@@ -33,10 +33,6 @@
       <groupId>org.sakaiproject.kernel</groupId>
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.sakaiproject.velocity</groupId>
       <artifactId>sakai-velocity-tool-api</artifactId>

diff --git a/basiclti/basiclti-api/pom.xml b/basiclti/basiclti-api/pom.xml
@@ -35,9 +35,5 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/basiclti/basiclti-blis/pom.xml b/basiclti/basiclti-blis/pom.xml
@@ -55,10 +55,6 @@
             <groupId>org.sakaiproject.edu-services.gradebook</groupId>
             <artifactId>gradebook-service-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -103,11 +99,6 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>

diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml
@@ -74,10 +74,6 @@
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
@@ -60,10 +60,6 @@
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-jdbc</artifactId>
 			</dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
 		<dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>

diff --git a/basiclti/basiclti-portlet/pom.xml b/basiclti/basiclti-portlet/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/basiclti/basiclti-tool/pom.xml b/basiclti/basiclti-tool/pom.xml
@@ -52,11 +52,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${sakai.commons-logging.version}</version>
-        </dependency>
         <dependency>
             <groupId>${sakai.velocity.groupId}</groupId>
             <artifactId>sakai-velocity-tool-api</artifactId>

diff --git a/basiclti/portlet-util/pom.xml b/basiclti/portlet-util/pom.xml
@@ -19,11 +19,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/basiclti/tsugi-util/pom-tsugi.xml
@@ -64,11 +64,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml
@@ -48,11 +48,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/basiclti/web-ifp/pom.xml b/basiclti/web-ifp/pom.xml
@@ -36,10 +36,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>

diff --git a/calendar/calendar-api/api/pom.xml b/calendar/calendar-api/api/pom.xml
@@ -33,9 +33,5 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
@@ -110,12 +110,6 @@
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.5</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/calendar/calendar-summary-tool/tool/pom.xml b/calendar/calendar-summary-tool/tool/pom.xml
@@ -90,16 +90,10 @@
         <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
-            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>

diff --git a/calendar/calendar-tool/tool/pom.xml b/calendar/calendar-tool/tool/pom.xml
@@ -64,10 +64,6 @@
             <groupId>org.sakaiproject.velocity</groupId>
             <artifactId>sakai-velocity-tool</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -76,10 +72,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/calendar/calendar-util/util/pom.xml b/calendar/calendar-util/util/pom.xml
@@ -48,10 +48,6 @@
             <groupId>org.sakaiproject.site</groupId>
             <artifactId>sakai-mergedlist-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
         <dependency>
         	<groupId>joda-time</groupId>
         	<artifactId>joda-time</artifactId>

diff --git a/calendar/calendar-util/util/src/test/resources/log4j.properties b/calendar/calendar-util/util/src/test/resources/log4j.properties
@@ -0,0 +1,6 @@
+log4j.appender.Stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n
+
+log4j.rootLogger=INFO,Stdout
+
diff --git a/chat/chat-impl/impl/pom.xml b/chat/chat-impl/impl/pom.xml
@@ -82,10 +82,6 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/chat/chat-tool/tool/pom.xml b/chat/chat-tool/tool/pom.xml
@@ -98,7 +98,6 @@
     <dependency>
       <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.6</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -107,17 +106,12 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
     </dependency>
     <dependency>
       <groupId>taglibs</groupId>
       <artifactId>standard</artifactId>
       <version>1.0.4</version>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <resources>