You are viewing a plain text version of this content. The canonical link for it is here.
Posted to portalapps-dev@portals.apache.org by vk...@apache.org on 2009/05/04 09:08:55 UTC
svn commit: r771215 - in /portals/applications/dbbrowser/trunk:
dbbrowser-jar/
dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/
dbbrowser-war/ dbbrowser-war/src/main/webapp/WEB-INF/
dbbrowser-war/src/main/webapp/WEB-INF/velocity/
Author: vkumar
Date: Mon May 4 07:08:55 2009
New Revision: 771215
URL: http://svn.apache.org/viewvc?rev=771215&view=rev
Log:
Migrating to slf4j in apa-dbbrowser
See: http://issues.apache.org/jira/browse/JS2-97
Modified:
portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml
portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/BrowserPortlet.java
portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserIterator.java
portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserPortlet.java
portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/velocity/velocity.properties
portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/pom.xml Mon May 4 07:08:55 2009
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with this
- work for additional information regarding copyright ownership. The ASF
- licenses this file to You under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
- or agreed to in writing, software distributed under the License is
- distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the specific language
- governing permissions and limitations under the License. $Id:$
--->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with this
+ work for additional information regarding copyright ownership. The ASF
+ licenses this file to You under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the specific language
+ governing permissions and limitations under the License. $Id:$
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -39,7 +39,7 @@
<properties>
<portlet-api.version>2.0</portlet-api.version>
<org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
- <commons-logging.version>1.1</commons-logging.version>
+ <slf4j.version>1.5.6</slf4j.version>
<poi.version>3.0-FINAL</poi.version>
<commons-collections.version>3.2</commons-collections.version>
<commons-digester.version>1.8</commons-digester.version>
@@ -60,17 +60,6 @@
<version>${org.apache.portals.bridges.velocity.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>${poi.version}</version>
@@ -92,5 +81,20 @@
<version>${commons-digester.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/BrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/BrowserPortlet.java?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/BrowserPortlet.java (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/BrowserPortlet.java Mon May 4 07:08:55 2009
@@ -34,11 +34,11 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
import org.apache.portals.messaging.PortletMessaging;
import org.apache.velocity.context.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* AbstractBrowserPortlet
@@ -98,7 +98,7 @@
/**
* Static initialization of the logger for this class
*/
- protected Log log = LogFactory.getLog(BrowserPortlet.class);
+ protected Logger log = LoggerFactory.getLogger(BrowserPortlet.class);
public void init(PortletConfig config) throws PortletException
{
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserIterator.java
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserIterator.java?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserIterator.java (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserIterator.java Mon May 4 07:08:55 2009
@@ -20,8 +20,8 @@
import java.util.Collections;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A class for iterating over the window. The window constitutes the selection
@@ -37,7 +37,7 @@
/**
* Static initialization of the logger for this class
*/
- transient protected Log log = LogFactory.getLog(DatabaseBrowserIterator.class);
+ transient protected Logger log = LoggerFactory.getLogger(DatabaseBrowserIterator.class);
private static final String VELOCITY_NULL_ENTRY = "-";
Modified: portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserPortlet.java?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserPortlet.java (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-jar/src/main/java/org/apache/portals/applications/dbBrowser/DatabaseBrowserPortlet.java Mon May 4 07:08:55 2009
@@ -16,10 +16,7 @@
*/
package org.apache.portals.applications.dbBrowser;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/pom.xml Mon May 4 07:08:55 2009
@@ -35,8 +35,8 @@
<properties>
<velocity.version>1.5</velocity.version>
- <velocity-tools.version>1.3</velocity-tools.version>
- <portals.applications.apa-webapp-logging.version>1.0-SNAPSHOT</portals.applications.apa-webapp-logging.version>
+ <velocity-tools.version>1.3</velocity-tools.version>
+ <slf4j.version>1.5.6</slf4j.version>
</properties>
<dependencies>
<!-- Runtime Dependencies -->
@@ -56,11 +56,21 @@
<version>${velocity-tools.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.portals.applications</groupId>
- <artifactId>apa-webapp-logging</artifactId>
- <version>${portals.applications.apa-webapp-logging.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
<build>
<finalName>apa-dbbrowser</finalName>
Modified: portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/velocity/velocity.properties?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/velocity/velocity.properties (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/velocity/velocity.properties Mon May 4 07:08:55 2009
@@ -29,9 +29,9 @@
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
+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/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml?rev=771215&r1=771214&r2=771215&view=diff
==============================================================================
--- portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/applications/dbbrowser/trunk/dbbrowser-war/src/main/webapp/WEB-INF/web.xml Mon May 4 07:08:55 2009
@@ -19,10 +19,6 @@
<display-name>Portals Database Browser application</display-name>
<description>Apache Portals Applications: db-browser portlet application</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>