Author: vkumar
Date: Sun May 3 18:59:05 2009
New Revision: 771101
URL: http://svn.apache.org/viewvc?rev=771101&view=rev
Log:
Migrating to slf4j in apa-demo
See: http://issues.apache.org/jira/browse/JS2-97
Modified:
portals/applications/demo/trunk/pom.xml
portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties
portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml
Modified: portals/applications/demo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/pom.xml?rev=771101&r1=771100&r2=771101&view=diff
==============================================================================
--- portals/applications/demo/trunk/pom.xml (original)
+++ portals/applications/demo/trunk/pom.xml Sun May 3 18:59:05 2009
@@ -37,14 +37,13 @@
<properties>
<portlet-api.version>1.0</portlet-api.version>
-
<portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
<portals.applications.apa-gems.version>1.0-SNAPSHOT</portals.applications.apa-gems.version>
<velocity.version>1.5</velocity.version>
<velocity-tools.version>1.3</velocity-tools.version>
<org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
- <commons-logging.version>1.1</commons-logging.version>
+ <slf4j.version>1.5.6</slf4j.version>
<log4j.version>1.2.14</log4j.version>
<javax.servlet.jstl.version>1.1.2</javax.servlet.jstl.version>
<javax.servlet.version>2.4</javax.servlet.version>
@@ -58,9 +57,9 @@
<antlr.version>2.7.6</antlr.version>
<castor.version>1.1.1-xml</castor.version>
<groovy.version>1.1-beta-2</groovy.version>
- <commons-collections.version>3.2</commons-collections.version>
+ <commons-collections.version>3.2</commons-collections.version>
<commons-digester.version>1.8</commons-digester.version>
- <commons-lang.version>2.1</commons-lang.version>
+ <commons-lang.version>2.1</commons-lang.version>
</properties>
<!-- Dependencies -->
@@ -98,12 +97,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-webapp-logging</artifactId>
- <version>${portals.applications.apa-webapp-logging.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${javax.servlet.jstl.version}</version>
@@ -150,28 +143,37 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>runtime</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- <scope>runtime</scope>
- </dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commons-digester.version}</version>
- <scope>runtime</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>runtime</scope>
- <version>${commons-lang.version}</version>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons-collections.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons-digester.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>runtime</scope>
+ <version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified:
portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties?rev=771101&r1=771100&r2=771101&view=diff
==============================================================================
---
portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties
(original)
+++
portals/applications/demo/trunk/src/main/webapp/WEB-INF/velocity/velocity.properties
Sun May 3 18:59:05 2009
@@ -28,10 +28,10 @@
runtime.log = velocity.log
-# use Commons Logging for routing Velocity message through our
IsolatedLog4JLogger
-runtime.log.logsystem.class
=org.apache.portals.applications.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
++# use Log4J for routing Velocity messages
++runtime.log.logsystem.class =org.apache.velocity.runtime.log.Log4JLogChute
# Log4J Category used (default is "velocity")
-runtime.log.logsystem.log4j.category = velocity
+runtime.log.logsystem.log4j.logger = velocity
#----------------------------------------------------------------------------
# T E M P L A T E E N C O D I N G
Modified: portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml?rev=771101&r1=771100&r2=771101&view=diff
==============================================================================
--- portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/demo/trunk/src/main/webapp/WEB-INF/web.xml Sun May 3
18:59:05 2009
@@ -19,10 +19,6 @@
<display-name>Demoportlets</display-name>
<description>Demo Portlets Applications</description>
- <listener>
-
<listener-class>org.apache.portals.applications.webapp.logging.Log4JConfigurator</listener-class>
- </listener>
-
<servlet>
<servlet-name>JetspeedContainer</servlet-name>
<display-name>Jetspeed Container</display-name>
