Commits

Anonymous committed 976f288

changed logging from using Log4j to jakarta's commons logging since commons logging is used throughly in all other places except these

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@2925573baa09-0c28-0410-bef9-dab3c582ae83

  • Participants
  • Parent commits 9950889

Comments (0)

Files changed (12)

webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/AbstractCRUDAction.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.action;
 
-import org.apache.log4j.Logger;
 import com.opensymphony.xwork.ActionSupport;
 import com.opensymphony.webwork.showcase.dao.Dao;
 import com.opensymphony.webwork.showcase.model.IdEntity;
 import java.util.Collection;
 import java.io.Serializable;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * AbstractCRUDAction.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public abstract class AbstractCRUDAction extends ActionSupport {
 
-    private static final Logger log = Logger.getLogger(AbstractCRUDAction.class);
+    private static final Log log = LogFactory.getLog(AbstractCRUDAction.class);
 
     private Collection availableItems;
     private String[] toDelete;

webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/EmployeeAction.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.action;
 
 import com.opensymphony.webwork.showcase.model.Skill;
 import com.opensymphony.webwork.showcase.application.TestDataProvider;
 import com.opensymphony.xwork.Preparable;
-import org.apache.log4j.Logger;
 
 import java.util.List;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.ArrayList;
 
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
 /**
  * EmployeeAction.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class EmployeeAction extends AbstractCRUDAction implements Preparable {
 
-    private static final Logger log = Logger.getLogger(EmployeeAction.class);
+    private static final Log log = LogFactory.getLog(EmployeeAction.class);
 
     private Long empId;
     protected EmployeeDao employeeDao;

webapps/showcase/src/java/com/opensymphony/webwork/showcase/action/SkillAction.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.action;
 
 import com.opensymphony.webwork.showcase.dao.SkillDao;
 import com.opensymphony.webwork.showcase.model.Skill;
 import com.opensymphony.xwork.Preparable;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * SkillAction.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class SkillAction extends AbstractCRUDAction implements Preparable {
 
-    private static final Logger log = Logger.getLogger(SkillAction.class);
+    private static final Log log = LogFactory.getLog(SkillAction.class);
 
     private String skillName;
     protected SkillDao skillDao;

webapps/showcase/src/java/com/opensymphony/webwork/showcase/application/TestDataProvider.java

 import com.opensymphony.webwork.showcase.exception.StorageException;
 import com.opensymphony.webwork.showcase.model.Employee;
 import com.opensymphony.webwork.showcase.model.Skill;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.InitializingBean;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.io.Serializable;
 import java.util.Date;
  * TestDataProvider.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class TestDataProvider implements Serializable, InitializingBean {
 
-    private static final Logger log = Logger.getLogger(TestDataProvider.class);
+    private static final Log log = LogFactory.getLog(TestDataProvider.class);
 
     public static final String[] POSITIONS = {
             "Developer",

webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/AbstractDao.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.dao;
 
-import org.apache.log4j.Logger;
 import com.opensymphony.webwork.showcase.model.IdEntity;
 import com.opensymphony.webwork.showcase.exception.CreateException;
 import com.opensymphony.webwork.showcase.exception.UpdateException;
 import java.io.Serializable;
 import java.util.Collection;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * AbstractDao.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public abstract class AbstractDao implements Serializable, Dao {
 
-    private static final Logger log = Logger.getLogger(AbstractDao.class);
+    private static final Log log = LogFactory.getLog(AbstractDao.class);
 
     private Storage storage;
 

webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/EmployeeDao.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.dao;
 
 import com.opensymphony.webwork.showcase.model.Employee;
 import com.opensymphony.webwork.showcase.model.IdEntity;
 import com.opensymphony.webwork.showcase.model.Skill;
-import org.apache.log4j.Logger;
 
 import java.util.List;
 import java.util.ArrayList;
 
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
 /**
  * EmployeeDao.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class EmployeeDao extends AbstractDao {
 
-    private static final Logger log = Logger.getLogger(EmployeeDao.class);
+    private static final Log log = LogFactory.getLog(EmployeeDao.class);
 
     protected SkillDao skillDao;
 

webapps/showcase/src/java/com/opensymphony/webwork/showcase/dao/SkillDao.java

-/* ====================================================================
- * The OpenSymphony Software License, Version 1.1
- *
- * (this license is derived and fully compatible with the Apache Software
- * License - see http://www.apache.org/LICENSE.txt)
- *
- * Copyright (c) 2001-2005 The OpenSymphony Group. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        OpenSymphony Group (http://www.opensymphony.com/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "OpenSymphony" and "The OpenSymphony Group"
- *    must not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact license@opensymphony.com .
- *
- * 5. Products derived from this software may not be called "OpenSymphony"
- *    or "WebWork", nor may "OpenSymphony" or "WebWork" appear in their
- *    name, without prior written permission of the OpenSymphony Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
  */
 package com.opensymphony.webwork.showcase.dao;
 
 import com.opensymphony.webwork.showcase.model.Skill;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * SkillDao.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class SkillDao extends AbstractDao {
 
-    private static final Logger log = Logger.getLogger(SkillDao.class);
+    private static final Log log = LogFactory.getLog(SkillDao.class);
 
     public Class getFeaturedClass() {
         return Skill.class;

webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/CreateException.java

 package com.opensymphony.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 
 /**
  * CreateException.
 
 public class CreateException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(CreateException.class);
+    private static final Log log = LogFactory.getLog(CreateException.class);
 
     public CreateException(String message) {
         super(message);

webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DeleteException.java

+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
+ */
 package com.opensymphony.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
 
 /**
  * DeleteException.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class DeleteException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(DeleteException.class);
+    private static final Log log = LogFactory.getLog(DeleteException.class);
 
     public DeleteException(String message) {
         super(message);

webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/DuplicateKeyException.java

+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
+ */
 package com.opensymphony.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
+
 
 /**
  * DuplicateKeyException.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class DuplicateKeyException extends CreateException {
 
-    private static final Logger log = Logger.getLogger(DuplicateKeyException.class);
+    private static final Log log = LogFactory.getLog(DuplicateKeyException.class);
 
     public DuplicateKeyException(String message) {
         super(message);

webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/StorageException.java

 package com.opensymphony.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * StorageException.
 
 public class StorageException extends Exception {
 
-    private static final Logger log = Logger.getLogger(StorageException.class);
+    private static final Log log = LogFactory.getLog(StorageException.class);
 
     public StorageException(String message) {
         super(message);

webapps/showcase/src/java/com/opensymphony/webwork/showcase/exception/UpdateException.java

+/*
+ * Copyright (c) 2002-2007 by OpenSymphony
+ * All rights reserved.
+ */
 package com.opensymphony.webwork.showcase.exception;
 
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
 
 /**
  * UpdateException.
  *
  * @author <a href="mailto:gielen@it-neering.net">Rene Gielen</a>
+ * @author tmjee
  */
 
 public class UpdateException extends StorageException {
 
-    private static final Logger log = Logger.getLogger(UpdateException.class);
+    private static final Log log = LogFactory.getLog(UpdateException.class);
 
     public UpdateException(String message) {
         super(message);