empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benni...@apache.org
Subject svn commit: r1066547 [1/2] - in /incubator/empire-db/trunk: ./ empire-db-codegen/src/main/java/org/apache/empire/db/codegen/ empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/ empire-db-codegen/src/test/java/org/apache/empire/db/codegen...
Date Wed, 02 Feb 2011 17:50:24 GMT
Author: benniven
Date: Wed Feb  2 17:50:21 2011
New Revision: 1066547

URL: http://svn.apache.org/viewvc?rev=1066547&view=rev
Log:
This commit is for EMPIREDB-38 and EMPIRE-77:
- log4j and jcl dependencies have been removed from core components (empre-db, empre-db-struts2, empire-db-codegen)
- added slf4j as logging api in the core components and modified the code to comply with the slf4j-api
- preserved log4j and jcl in the examples

still to do:
- check if logging is configured properly in the examples
- use parameterized logging instead of ".toString()"

Added:
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/log4j.properties
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/log4j.properties
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/log4j.properties
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/log4j.properties
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/log4j.properties
Modified:
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenApp.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/DBUtil.java
    incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/FileUtils.java
    incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/util/DBUtilTest.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/config.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/config.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml
    incubator/empire-db/trunk/empire-db-examples/pom.xml
    incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/FormActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ReaderListActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlTagDictionary.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlWriter.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/ActionAccessInterceptor.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/InterceptorSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/AnchorComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/CalendarComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/ControlComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/FormComponent.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/info/CalendarInfo.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FlexDivTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FloatClearTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletDispatcher.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletResult.java
    incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireStrutsDispatcher.java
    incubator/empire-db/trunk/empire-db/pom.xml
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ObjectUtils.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/bean/BeanRecordProxy.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBBlobData.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpr.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBObject.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecordData.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBSQLScript.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDataDictionnary.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLConfiguration.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLUtil.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/xml/XMLWriter.java
    incubator/empire-db/trunk/pom.xml

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenApp.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenApp.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenApp.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenApp.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.db.codegen;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.db.DBDatabase;
 
@@ -29,7 +29,7 @@ import org.apache.empire.db.DBDatabase;
  */
 public class CodeGenApp {
 	
-	private static final Log log = LogFactory.getLog(CodeGenApp.class);
+	private static final Logger log = LoggerFactory.getLogger(CodeGenApp.class);
 	
 	private static final String DEFAULT_CONFIG_FILE = "config.xml";
 	

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenParser.java Wed Feb  2 17:50:21 2011
@@ -28,8 +28,8 @@ import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.data.DataType;
@@ -69,7 +69,7 @@ public class CodeGenParser extends Error
 		}
 	}
 
-	private static final Log log = LogFactory.getLog(CodeGenParser.class);
+	private static final Logger log = LoggerFactory.getLogger(CodeGenParser.class);
 	
 	private DatabaseMetaData dbMeta;
 	private Connection con;

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/CodeGenWriter.java Wed Feb  2 17:50:21 2011
@@ -25,8 +25,8 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.db.DBDatabase;
 import org.apache.empire.db.DBTable;
 import org.apache.empire.db.DBView;
@@ -64,7 +64,7 @@ import org.apache.velocity.runtime.resou
  */
 
 public class CodeGenWriter {
-	private static final Log log = LogFactory.getLog(CodeGenWriter.class);
+	private static final Logger log = LoggerFactory.getLogger(CodeGenWriter.class);
 
 	// Templates
 	public static final String DATABASE_TEMPLATE = "Database.vm";
@@ -111,7 +111,7 @@ public class CodeGenWriter {
 		try {
 			engine.init();
 		} catch (Exception e) {
-			log.fatal(e);
+			log.error("A Exception occured on initializing the velocity-engine:", e);
 			throw new RuntimeException(e);
 		}
 	}

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/WriterService.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.data.DataType;
 import org.apache.empire.db.DBColumn;
 import org.apache.empire.db.DBRecord;
@@ -37,7 +37,7 @@ import org.apache.empire.db.DBTableColum
  */
 public class WriterService {
 
-	private static final Log log = LogFactory.getLog(WriterService.class);
+	private static final Logger log = LoggerFactory.getLogger(WriterService.class);
 
 	private final CodeGenConfig config;
 	private final Set<String> dbrecMethodNames;

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/DBUtil.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/DBUtil.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/DBUtil.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/DBUtil.java Wed Feb  2 17:50:21 2011
@@ -22,7 +22,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 
 public final class DBUtil {
@@ -39,7 +39,7 @@ public final class DBUtil {
 	 * @param log the logger instance to use for logging
 	 * @return true on succes
 	 */
-	public static boolean close(ResultSet rs, Log log) {
+	public static boolean close(ResultSet rs, Logger log) {
 		boolean b = false;
 		try {
 			if(rs!=null)
@@ -54,13 +54,13 @@ public final class DBUtil {
 	/**
 	 * Closes a JDBC-Connection and logs exceptions.
 	 */
-	public static void close(Connection conn, Log log) {
+	public static void close(Connection conn, Logger log) {
 		if(conn != null){
 			log.info("Closing database connection");
 			try {
 				conn.close();
 			} catch (Exception e) {
-				log.fatal("Error closing connection", e);
+				log.error("Error closing connection", e);
 			}
 		}
 	}

Modified: incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/FileUtils.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/FileUtils.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/main/java/org/apache/empire/db/codegen/util/FileUtils.java Wed Feb  2 17:50:21 2011
@@ -31,8 +31,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * File utilities
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
  */
 public class FileUtils {
 	
-	private static final Log log =  LogFactory.getLog(FileUtils.class);
+	private static final Logger log =  LoggerFactory.getLogger(FileUtils.class);
 	public static final String SEPARATOR =  System.getProperty("file.separator");
 	private FileUtils()
 	{

Modified: incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/util/DBUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/util/DBUtilTest.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/util/DBUtilTest.java (original)
+++ incubator/empire-db/trunk/empire-db-codegen/src/test/java/org/apache/empire/db/codegen/util/DBUtilTest.java Wed Feb  2 17:50:21 2011
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTru
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -33,7 +33,7 @@ public class DBUtilTest {
 	@Test
 	public void testCloseResultSet() throws SQLException {
 		// null
-		Log log = Mockito.mock(Log.class);
+		Logger log = Mockito.mock(Logger.class);
 		boolean succes = DBUtil.close((ResultSet)null, log);
 		assertTrue(succes);
 		

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/config.xml Wed Feb  2 17:50:21 2011
@@ -94,59 +94,4 @@
 		<schemaName>DBSAMPLEADV</schemaName>
 	</properties-sqlserver>
 	
-	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-		<appender name="default" class="org.apache.log4j.ConsoleAppender">
-			<!-- layout class="org.apache.log4j.TTCCLayout"/ -->
-			<layout class="org.apache.log4j.PatternLayout">
-				<!-- param name="ConversionPattern" value="NSB(%c) %-5p %m	at %l%n"/ -->
-				<param name="ConversionPattern" value="%-5p [%d{yyyy/MM/dd HH:mm}]: %m		at %l %n"/>
-			</layout>
-		</appender>
-	
-		<!-- log detail configuration -->
-
-		<logger name="org.apache.empire.xml" additivity="false">
-			<level value="info"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.commons" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.db" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-
-		<!-- Set this level to "debug" to log all SQL-Statements -->		
-		<logger name="org.apache.empire.db.DBDatabase" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-		<logger name="org.apache.empire.db.DBDatabaseDriver" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-
-		<!-- Set this level to "debug" to log all DDL-Statements -->		
-		<logger name="org.apache.empire.db.DBSQLScript" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.samples.db.advanced" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<root>
-			<priority value="info"/>
-			<appender-ref ref="default"/>
-		</root>
-
-	</log4j:configuration>
-	
 </config>

Added: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/log4j.properties?rev=1066547&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/log4j.properties (added)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/log4j.properties Wed Feb  2 17:50:21 2011
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootCategory=FATAL, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern = %d{ISO8601} %-5p [%c] - %m%n

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvConfig.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvConfig.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/SampleAdvConfig.java Wed Feb  2 17:50:21 2011
@@ -18,7 +18,9 @@
  */
 package org.apache.empire.samples.db.advanced;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.empire.xml.XMLConfiguration;
+import org.apache.log4j.xml.DOMConfigurator;
 
 /**
  * <PRE>

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/config.xml Wed Feb  2 17:50:21 2011
@@ -93,50 +93,4 @@
 		<jdbcPwd>esteam</jdbcPwd>
 		<schemaName>DBSAMPLE</schemaName>
 	</properties-sqlserver>
-	
-	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-		<appender name="default" class="org.apache.log4j.ConsoleAppender">
-			<!-- layout class="org.apache.log4j.TTCCLayout"/ -->
-			<layout class="org.apache.log4j.PatternLayout">
-				<!-- param name="ConversionPattern" value="NSB(%c) %-5p %m	at %l%n"/ -->
-				<param name="ConversionPattern" value="%-5p [%d{yyyy/MM/dd HH:mm}]: %m		at %l %n"/>
-			</layout>
-		</appender>
-	
-		<!-- log detail configuration -->
-
-		<logger name="org.apache.empire.xml" additivity="false">
-			<level value="info"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.commons" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.db" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-
-		<!-- Set this level to "debug" to log all SQL-Statements -->		
-		<logger name="org.apache.empire.db.DBDatabase" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.samples.db" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<root>
-			<priority value="info"/>
-			<appender-ref ref="default"/>
-		</root>
-
-	</log4j:configuration>
-	
 </config>

Added: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/log4j.properties?rev=1066547&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/log4j.properties (added)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/log4j.properties Wed Feb  2 17:50:21 2011
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootCategory=FATAL, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern = %d{ISO8601} %-5p [%c] - %m%n

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,9 @@
  */
 package org.apache.empire.samples.db;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.empire.xml.XMLConfiguration;
-
+import org.apache.log4j.xml.DOMConfigurator;
 /**
  * <PRE>
  * The SampleConfig class provides access to configuration settings.

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/config.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/config.xml Wed Feb  2 17:50:21 2011
@@ -64,54 +64,4 @@
 		<schemaName>DBSAMPLE</schemaName>
 	</properties-sqlserver>
 	
-	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-		<appender name="default" class="org.apache.log4j.ConsoleAppender">
-			<!-- layout class="org.apache.log4j.TTCCLayout"/ -->
-			<layout class="org.apache.log4j.PatternLayout">
-				<!-- param name="ConversionPattern" value="NSB(%c) %-5p %m	at %l%n"/ -->
-				<param name="ConversionPattern" value="%-5p [%d{yyyy/MM/dd HH:mm}]: %m		at %l %n"/>
-			</layout>
-		</appender>
-	
-		<!-- log detail configuration -->
-
-		<logger name="org.apache.empire.xml" additivity="false">
-			<level value="info"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.commons" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.db" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<!-- Set this level to "debug" to log all SQL-Statements -->		
-		<logger name="org.apache.empire.db.DBDatabase" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.struts2" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.struts2.websample" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<root>
-			<priority value="info"/>
-			<appender-ref ref="default"/>
-		</root>
-
-	</log4j:configuration>
-	
 </config>

Added: incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/log4j.properties?rev=1066547&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/log4j.properties (added)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/log4j.properties Wed Feb  2 17:50:21 2011
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootCategory=FATAL, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern = %d{ISO8601} %-5p [%c] - %m%n

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-cxf/src/main/java/org/apache/empire/samples/cxf/wssample/server/SampleConfig.java Wed Feb  2 17:50:21 2011
@@ -18,7 +18,9 @@
  */
 package org.apache.empire.samples.cxf.wssample.server;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.empire.xml.XMLConfiguration;
+import org.apache.log4j.xml.DOMConfigurator;
 
 public class SampleConfig extends XMLConfiguration {
 

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/pom.xml Wed Feb  2 17:50:21 2011
@@ -45,11 +45,6 @@
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>2.1.3</version>
 		</dependency>
-		
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
 
 		<!-- Jetty is needed if you're are not using the CXFServlet -->
 		<dependency>

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java Wed Feb  2 17:50:21 2011
@@ -18,7 +18,9 @@
  */
 package org.apache.empire.struts2.websample.web;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.empire.xml.XMLConfiguration;
+import org.apache.log4j.xml.DOMConfigurator;
 
 public class SampleConfig extends XMLConfiguration {
 	

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/config.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/config.xml Wed Feb  2 17:50:21 2011
@@ -30,55 +30,4 @@
 		<servicePort>8081</servicePort>
 		<serviceName>employeeService</serviceName>
 	</properties-webservice>
-	
-	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-		<appender name="default" class="org.apache.log4j.ConsoleAppender">
-			<!-- layout class="org.apache.log4j.TTCCLayout"/ -->
-			<layout class="org.apache.log4j.PatternLayout">
-				<!-- param name="ConversionPattern" value="NSB(%c) %-5p %m	at %l%n"/ -->
-				<param name="ConversionPattern" value="%-5p [%d{yyyy/MM/dd HH:mm}]: %m		at %l %n"/>
-			</layout>
-		</appender>
-	
-		<!-- log detail configuration -->
-
-		<logger name="org.apache.empire.xml" additivity="false">
-			<level value="info"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.commons" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.db" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<!-- Set this level to "debug" to log all SQL-Statements -->		
-		<logger name="org.apache.empire.db.DBDatabase" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.struts2" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.struts2.websample" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<root>
-			<priority value="info"/>
-			<appender-ref ref="default"/>
-		</root>
-
-	</log4j:configuration>
-	
 </config>

Added: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/log4j.properties?rev=1066547&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/log4j.properties (added)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/log4j.properties Wed Feb  2 17:50:21 2011
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootCategory=FATAL, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern = %d{ISO8601} %-5p [%c] - %m%n

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/pom.xml Wed Feb  2 17:50:21 2011
@@ -50,10 +50,6 @@
 			<artifactId>hsqldb</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
             <scope>runtime</scope>

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/java/org/apache/empire/struts2/websample/web/SampleConfig.java Wed Feb  2 17:50:21 2011
@@ -18,7 +18,9 @@
  */
 package org.apache.empire.struts2.websample.web;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.empire.xml.XMLConfiguration;
+import org.apache.log4j.xml.DOMConfigurator;
 
 public class SampleConfig extends XMLConfiguration {
 

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/config.xml Wed Feb  2 17:50:21 2011
@@ -64,54 +64,4 @@
 		<schemaName>DBSAMPLE</schemaName>
 	</properties-sqlserver>
 	
-	<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-		<appender name="default" class="org.apache.log4j.ConsoleAppender">
-			<!-- layout class="org.apache.log4j.TTCCLayout"/ -->
-			<layout class="org.apache.log4j.PatternLayout">
-				<!-- param name="ConversionPattern" value="NSB(%c) %-5p %m	at %l%n"/ -->
-				<param name="ConversionPattern" value="%-5p [%d{yyyy/MM/dd HH:mm}]: %m		at %l %n"/>
-			</layout>
-		</appender>
-	
-		<!-- log detail configuration -->
-
-		<logger name="org.apache.empire.xml" additivity="false">
-			<level value="info"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.commons" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.db" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<!-- Set this level to "debug" to log all SQL-Statements -->		
-		<logger name="org.apache.empire.db.DBDatabase" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<logger name="org.apache.empire.struts2" additivity="false">
-			<level value="warn"/>
-			<appender-ref ref="default"/>
-		</logger>
-		
-		<logger name="org.apache.empire.struts2.websample" additivity="false">
-			<level value="debug"/>
-			<appender-ref ref="default"/>
-		</logger>
-	
-		<root>
-			<priority value="info"/>
-			<appender-ref ref="default"/>
-		</root>
-
-	</log4j:configuration>
-	
 </config>

Added: incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/log4j.properties?rev=1066547&view=auto
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/log4j.properties (added)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/log4j.properties Wed Feb  2 17:50:21 2011
@@ -0,0 +1,21 @@
+# 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.
+
+log4j.rootCategory=FATAL, console
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.conversionPattern = %d{ISO8601} %-5p [%c] - %m%n

Modified: incubator/empire-db/trunk/empire-db-examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/pom.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-examples/pom.xml Wed Feb  2 17:50:21 2011
@@ -26,6 +26,22 @@
 	<artifactId>empire-db-examples</artifactId>
 	<packaging>pom</packaging>
 	<name>Apache Empire-db Examples</name>
+	<dependencies>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+		</dependency>
+	</dependencies>
 	<modules>
 		<module>empire-db-example-basic</module>
 		<module>empire-db-example-advanced</module>

Modified: incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db-maven-plugin/pom.xml Wed Feb  2 17:50:21 2011
@@ -51,8 +51,14 @@
 			<version>2.0</version>
 		</dependency>
 		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/WebAction.java Wed Feb  2 17:50:21 2011
@@ -25,8 +25,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.ErrorType;
@@ -58,7 +58,7 @@ public abstract class WebAction extends 
 {   
     // Logger
     @SuppressWarnings("hiding")
-    protected static Log log = LogFactory.getLog(WebAction.class);
+    protected static Logger log = LoggerFactory.getLogger(WebAction.class);
 
     // Default Name for Item param
     public static String DEFAULT_ITEM_PROPERTY_NAME = "item";

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionBase.java Wed Feb  2 17:50:21 2011
@@ -20,8 +20,8 @@ package org.apache.empire.struts2.action
 
 import java.sql.Connection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.Column;
@@ -42,7 +42,7 @@ public abstract class ActionBase
     implements ActionItemProperty, RequestParamProvider, LocaleProvider
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ActionBase.class);
+    protected static Logger log = LoggerFactory.getLogger(ActionBase.class);
  
     private static final char KEY_SEP_CHAR  = '/';
     private static final char NEW_FLAG_CHAR = '*';
@@ -138,7 +138,7 @@ public abstract class ActionBase
                 obj = objClass.newInstance();
                 context.getSession().put(key, obj);
             } catch(Exception e) {
-                log.fatal("Cannot create Instance of type " + objClass.getName(), e);
+                log.error("Cannot create Instance of type " + objClass.getName(), e);
             }
         }
         return obj;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionPropertySupport.java Wed Feb  2 17:50:21 2011
@@ -18,15 +18,15 @@
  */
 package org.apache.empire.struts2.actionsupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.StringUtils;
 
 
 public class ActionPropertySupport
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ActionPropertySupport.class);
+    protected static Logger log = LoggerFactory.getLogger(ActionPropertySupport.class);
 
     private ActionBase action;
     private String propertyName;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/FormActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/FormActionSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/FormActionSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/FormActionSupport.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.struts2.actionsupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.commons.StringUtils;
@@ -28,7 +28,7 @@ import org.apache.empire.data.Column;
 
 public abstract class FormActionSupport extends ErrorObject
 {
-    protected static Log log = LogFactory.getLog(FormActionSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(FormActionSupport.class);
 
     protected ActionBase action;
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ListActionSupport.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.struts2.actionsupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorObject;
 import org.apache.empire.data.ColumnExpr;
 import org.apache.empire.struts2.action.ListPagingInfo;
@@ -37,7 +37,7 @@ import org.apache.empire.struts2.action.
 public abstract class ListActionSupport extends ErrorObject
     implements ListPagingInfo, ListSortingInfo
 {
-    protected static Log log = LogFactory.getLog(ListActionSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(ListActionSupport.class);
     
     protected ActionBase action;
     protected String propertyName;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ReaderListActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ReaderListActionSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ReaderListActionSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ReaderListActionSupport.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.struts2.actionsupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.db.DBCommandExpr;
 import org.apache.empire.db.DBReader;
 
@@ -34,7 +34,7 @@ import org.apache.empire.db.DBReader;
 public class ReaderListActionSupport extends ListActionSupport
 {
     @SuppressWarnings("hiding")
-    protected static Log log = LogFactory.getLog(RecordActionSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(RecordActionSupport.class);
     
     protected DBReader  reader;
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java Wed Feb  2 17:50:21 2011
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.data.Record;
@@ -79,7 +79,7 @@ public class RecordActionSupport extends
     
     
     @SuppressWarnings("hiding")
-    protected static Log log = LogFactory.getLog(RecordActionSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(RecordActionSupport.class);
 
     protected DBRowSet rowset;
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/TextProviderActionSupport.java Wed Feb  2 17:50:21 2011
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.ResourceBundleTextProvider;
@@ -35,7 +35,7 @@ public class TextProviderActionSupport e
 {
 
     private static Map<Locale, Map<String, String>> maps = new Hashtable<Locale, Map<String, String>>();
-    protected static Log log = LogFactory.getLog(TextProviderActionSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(TextProviderActionSupport.class);
     private static final String INVALID_TEXT = "NO_TEXT";
     
     private LocaleProvider aLocaleProvider;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlTagDictionary.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlTagDictionary.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlTagDictionary.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlTagDictionary.java Wed Feb  2 17:50:21 2011
@@ -18,13 +18,13 @@
  */
 package org.apache.empire.struts2.html;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class HtmlTagDictionary
 {
     // Logger
-    protected static Log log = LogFactory.getLog(HtmlTagDictionary.class);
+    protected static Logger log = LoggerFactory.getLogger(HtmlTagDictionary.class);
 
     private static HtmlTagDictionary htmlDictonary; 
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlWriter.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlWriter.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlWriter.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/html/HtmlWriter.java Wed Feb  2 17:50:21 2011
@@ -21,8 +21,8 @@ package org.apache.empire.struts2.html;
 import java.io.IOException;
 import java.io.Writer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.StringUtils;
 import org.apache.commons.lang.xwork.StringEscapeUtils;
 
@@ -30,7 +30,7 @@ import org.apache.commons.lang.xwork.Str
 public class HtmlWriter
 {
     // Logger
-    protected static Log log = LogFactory.getLog(HtmlWriter.class);
+    protected static Logger log = LoggerFactory.getLogger(HtmlWriter.class);
     
     public static class HtmlTag
     {
@@ -205,8 +205,7 @@ public class HtmlWriter
             if (endOfLine)
                 writer.write("\n");
           } catch(IOException e) {
-              log.error(e.getMessage());
-              log.error(e.getStackTrace());
+              log.error(e.getMessage(), e);
           }
     }
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/ActionAccessInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/ActionAccessInterceptor.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/ActionAccessInterceptor.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/ActionAccessInterceptor.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.struts2.interceptors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.action.ActionAccessValidator;
 
 import com.opensymphony.xwork2.ActionInvocation;
@@ -31,7 +31,7 @@ public class ActionAccessInterceptor ext
 {
     // Logger
     @SuppressWarnings("hiding")
-    protected static Log log = LogFactory.getLog(ActionAccessInterceptor.class);
+    protected static Logger log = LoggerFactory.getLogger(ActionAccessInterceptor.class);
 
     private String loginAction = null;
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/InterceptorSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/InterceptorSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/InterceptorSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/interceptors/InterceptorSupport.java Wed Feb  2 17:50:21 2011
@@ -26,8 +26,8 @@ import javax.portlet.PortletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.portlet.servlet.PortletServletRequest;
 import org.apache.struts2.portlet.servlet.PortletServletResponse;
@@ -39,7 +39,7 @@ import com.opensymphony.xwork2.intercept
 public abstract class InterceptorSupport extends AbstractInterceptor
 {
     // Logger
-    protected static Log log = LogFactory.getLog(InterceptorSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(InterceptorSupport.class);
     
     public static final String NONE = "none";
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/AnchorComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/AnchorComponent.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/AnchorComponent.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/AnchorComponent.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import java.io.Writer;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.html.HtmlTagDictionary;
 import org.apache.empire.struts2.html.HtmlWriter;
 import org.apache.empire.struts2.html.HtmlWriter.HtmlTag;
@@ -37,7 +37,7 @@ import com.opensymphony.xwork2.util.Valu
 public class AnchorComponent extends Anchor
 {
     // Logger
-    protected static Log log = LogFactory.getLog(AnchorComponent.class);
+    protected static Logger log = LoggerFactory.getLogger(AnchorComponent.class);
     
     private String  text;
     /*

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/CalendarComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/CalendarComponent.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/CalendarComponent.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/CalendarComponent.java Wed Feb  2 17:50:21 2011
@@ -25,8 +25,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.Attributes;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.struts2.html.HtmlWriter;
@@ -45,7 +45,7 @@ import com.opensymphony.xwork2.util.Valu
 public class CalendarComponent extends UIBean
 {
     // Logger
-    protected static Log log                 = LogFactory.getLog(ControlComponent.class);
+    protected static Logger log              = LoggerFactory.getLogger(ControlComponent.class);
 
     protected UrlRenderer urlRenderer;
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/ControlComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/ControlComponent.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/ControlComponent.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/ControlComponent.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.Options;
 import org.apache.empire.commons.StringUtils;
@@ -43,7 +43,7 @@ import com.opensymphony.xwork2.util.Valu
 public abstract class ControlComponent extends UIBean implements InputControl.ValueInfo
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ControlComponent.class);
+    protected static Logger log = LoggerFactory.getLogger(ControlComponent.class);
 
     // Properties
     protected Column     column;
@@ -108,7 +108,7 @@ public abstract class ControlComponent e
             return ActionContext.getContext().getActionInvocation().getAction();
         } catch (Exception e)
         {
-            log.fatal("Unable to detect Action. Action Invocation not available!");
+            log.error("Unable to detect Action. Action Invocation not available!");
             return "";
         }
     }

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/DataValueComponent.java Wed Feb  2 17:50:21 2011
@@ -23,8 +23,8 @@ import java.io.StringWriter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.html.HtmlWriter;
 import org.apache.empire.struts2.html.HtmlWriter.HtmlTag;
 import org.apache.empire.struts2.jsp.controls.InputControl;
@@ -40,7 +40,7 @@ public class DataValueComponent extends 
 {
     // Logger
     @SuppressWarnings("hiding")
-	protected static Log log = LogFactory.getLog(DataValueComponent.class);
+	protected static Logger log = LoggerFactory.getLogger(DataValueComponent.class);
 
     protected UrlRenderer urlRenderer;
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/FormComponent.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/FormComponent.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/FormComponent.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/FormComponent.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.xwork.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.html.HtmlWriter;
 import org.apache.empire.struts2.html.HtmlWriter.HtmlTag;
 import org.apache.struts2.components.Form;
@@ -36,7 +36,7 @@ import com.opensymphony.xwork2.util.Valu
 public class FormComponent extends Form
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ControlComponent.class);
+    protected static Logger log = LoggerFactory.getLogger(ControlComponent.class);
     
     // Internal use only
     private HtmlTag formTag = null;

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/info/CalendarInfo.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/info/CalendarInfo.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/info/CalendarInfo.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/components/info/CalendarInfo.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.DateUtils;
 import org.apache.empire.struts2.jsp.components.ControlComponent;
 
@@ -33,7 +33,7 @@ import org.apache.empire.struts2.jsp.com
 public class CalendarInfo
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ControlComponent.class);
+    protected static Logger log = LoggerFactory.getLogger(ControlComponent.class);
 
     private static final String DATE_FORMAT = "yyyyMMdd";
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/controls/InputControl.java Wed Feb  2 17:50:21 2011
@@ -20,8 +20,8 @@ package org.apache.empire.struts2.jsp.co
 
 import java.util.Locale;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.ErrorInfo;
 import org.apache.empire.commons.ErrorType;
 import org.apache.empire.commons.Options;
@@ -37,7 +37,7 @@ import org.apache.commons.lang.xwork.Str
 public abstract class InputControl
 {
     // Logger
-    protected static Log log = LogFactory.getLog(InputControl.class);
+    protected static Logger log = LoggerFactory.getLogger(InputControl.class);
 
     // Special Input Column Attributes
     public static final String NUMBER_FORMAT_ATTRIBUTE    = "numberFormat";   // "Integer", "Currency", "Percent"  

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/EmpireTagSupport.java Wed Feb  2 17:50:21 2011
@@ -28,8 +28,8 @@ import javax.servlet.jsp.JspException;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtilsBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.commons.StringUtils;
 import org.apache.empire.struts2.action.ActionItemProperty;
 import org.apache.empire.struts2.html.HtmlWriter.HtmlTag;
@@ -45,7 +45,7 @@ import com.opensymphony.xwork2.TextProvi
 public abstract class EmpireTagSupport extends ComponentTagSupport
 {
     // Logger
-    protected static Log log = LogFactory.getLog(EmpireTagSupport.class);
+    protected static Logger log = LoggerFactory.getLogger(EmpireTagSupport.class);
 
     protected boolean    autoResetParams = true;
 
@@ -147,7 +147,7 @@ public abstract class EmpireTagSupport e
         try {
             return ActionContext.getContext().getActionInvocation().getAction();
         } catch (Exception e) {
-            log.fatal("Unable to detect Action. Action Invocation not available!");
+            log.error("Unable to detect Action. Action Invocation not available!");
             return "";
         }
     }
@@ -157,7 +157,7 @@ public abstract class EmpireTagSupport e
         try {
             return ActionContext.getContext().getActionInvocation().getProxy().getActionName();
         } catch (Exception e) {
-            log.fatal("Unable to detect Action name. Action Invocation Proxy not available!");
+            log.error("Unable to detect Action name. Action Invocation Proxy not available!");
             return "";
         }
     }

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FlexDivTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FlexDivTag.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FlexDivTag.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FlexDivTag.java Wed Feb  2 17:50:21 2011
@@ -52,7 +52,7 @@ public class FlexDivTag extends EmpireTa
     @Override
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res)
     {
-        log.fatal("No Bean available for flex-tag");
+        log.error("No Bean available for flex-tag");
         return null;
     }
 

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FloatClearTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FloatClearTag.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FloatClearTag.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/FloatClearTag.java Wed Feb  2 17:50:21 2011
@@ -21,8 +21,8 @@ package org.apache.empire.struts2.jsp.ta
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.html.HtmlTagDictionary;
 
 
@@ -30,7 +30,7 @@ import org.apache.empire.struts2.html.Ht
 public class FloatClearTag extends BodyTagSupport
 {
     // Logger
-    protected static Log log = LogFactory.getLog(FloatClearTag.class);
+    protected static Logger log = LoggerFactory.getLogger(FloatClearTag.class);
     
     @Override
     public int doStartTag()

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/jsp/tags/ItemListTag.java Wed Feb  2 17:50:21 2011
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletRes
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.db.DBReader;
 import org.apache.struts2.components.Component;
 import org.apache.struts2.components.IteratorComponent;
@@ -42,7 +42,7 @@ import com.opensymphony.xwork2.util.Valu
 public class ItemListTag extends IteratorTag
 {
     // Logger
-    protected static Log log = LogFactory.getLog(ItemListTag.class);
+    protected static Logger log = LoggerFactory.getLogger(ItemListTag.class);
 
     public static class ItemIteratorComponent extends IteratorComponent
     {

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletDispatcher.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletDispatcher.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletDispatcher.java Wed Feb  2 17:50:21 2011
@@ -27,8 +27,8 @@ import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 import javax.portlet.PortletSession;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.action.Disposable;
 import org.apache.empire.struts2.web.portlet.PortletContextWrapper;
 import org.apache.empire.struts2.web.portlet.PortletRequestWrapper;
@@ -38,7 +38,7 @@ import org.apache.struts2.portlet.dispat
 
 public class EmpirePortletDispatcher extends Jsr168Dispatcher {
     // Logger
-    protected static Log log = LogFactory.getLog(EmpireStrutsDispatcher.class);
+    protected static Logger log = LoggerFactory.getLogger(EmpireStrutsDispatcher.class);
 
     public final String RENDER_DIRECT_ACTION = "struts.portlet.renderDirectAction";
     

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletResult.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletResult.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletResult.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpirePortletResult.java Wed Feb  2 17:50:21 2011
@@ -24,8 +24,8 @@ import java.util.Map;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.action.WebAction;
 import org.apache.struts2.portlet.PortletActionConstants;
 import org.apache.struts2.portlet.context.PortletActionContext;
@@ -37,7 +37,7 @@ public class EmpirePortletResult extends
 {
 	private static final long serialVersionUID = -6883272432993216278L;
 
-    protected static Log log = LogFactory.getLog(EmpirePortletResult.class);
+    protected static Logger log = LoggerFactory.getLogger(EmpirePortletResult.class);
 	
 	private String renderMethod = "renderPortlet";
 	

Modified: incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireStrutsDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireStrutsDispatcher.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireStrutsDispatcher.java (original)
+++ incubator/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/EmpireStrutsDispatcher.java Wed Feb  2 17:50:21 2011
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.struts2.action.Disposable;
 import org.apache.empire.struts2.web.servlet.ServletContextWrapper;
 import org.apache.empire.struts2.web.servlet.ServletRequestWrapper;
@@ -40,7 +40,7 @@ import org.apache.struts2.dispatcher.map
 public class EmpireStrutsDispatcher extends Dispatcher
 {
     // Logger
-    protected static Log log = LogFactory.getLog(EmpireStrutsDispatcher.class);
+    protected static Logger log = LoggerFactory.getLogger(EmpireStrutsDispatcher.class);
 
     public final String APPLICATION_CLASS = "ApplicationClass";
     public final String SESSION_CLASS     = "SessionClass";

Modified: incubator/empire-db/trunk/empire-db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/pom.xml?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/pom.xml (original)
+++ incubator/empire-db/trunk/empire-db/pom.xml Wed Feb  2 17:50:21 2011
@@ -35,12 +35,10 @@
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>-->
-		<!-- TODO we should get rid of this dependency -->
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<!-- <scope>runtime</scope>-->
-			<!-- <optional>true</optional> -->
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.6.1</version>
 		</dependency>
 		<!-- TEST -->
 		<dependency>
@@ -53,6 +51,6 @@
 		    <artifactId>commons-io</artifactId>
 		    <version>1.4</version>
 		    <scope>test</scope>
-		</dependency> 
+		</dependency>
 	</dependencies>
 </project>

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/DateUtils.java Wed Feb  2 17:50:21 2011
@@ -25,8 +25,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class contains common functions for comparing and converting values of type Date. 
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
 public class DateUtils
 {
     // Logger
-    private static final Log log = LogFactory.getLog(DateUtils.class);
+    private static final Logger log = LoggerFactory.getLogger(DateUtils.class);
     
     private DateUtils()
     {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorObject.java Wed Feb  2 17:50:21 2011
@@ -21,8 +21,8 @@ package org.apache.empire.commons;
 import java.text.MessageFormat;
 import java.util.WeakHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.empire.EmpireException;
 
 
@@ -41,7 +41,7 @@ import org.apache.empire.EmpireException
 public abstract class ErrorObject implements ErrorInfo
 {
     // Logger
-    private static final Log log = LogFactory.getLog(ErrorObject.class);
+    private static final Logger log = LoggerFactory.getLogger(ErrorObject.class);
     // Exceptions flag
     private static boolean exceptionsEnabled = false;
 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java?rev=1066547&r1=1066546&r2=1066547&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/ErrorType.java Wed Feb  2 17:50:21 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.empire.commons;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The ErrorType class defines a type of error.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ErrorType
 {
-    private static final Log log = LogFactory.getLog(ErrorType.class);
+    private static final Logger log = LoggerFactory.getLogger(ErrorType.class);
 
     private final String key;
     private final String msgPattern;



Mime
View raw message