xlawrence 2005/07/12 09:19:45 CEST
Modified files:
core/src/java/org/jahia/services/acl
JahiaACLManagerService.java
core/src/java/org/jahia/services/applications
J2UserManagerImpl.java
JahiaUserInfoManagerImpl.java
PlutoServletRequestImpl.java
core/src/java/org/jahia/services/containers
ContentContainer.java
ContentContainerTools.java
JahiaContainersBaseService.java
core/src/java/org/jahia/services/fields ContentField.java
core/src/java/org/jahia/services/homepages
JahiaHomepagesBaseService.java
core/src/java/org/jahia/services/lock LockRegistry.java
core/src/java/org/jahia/services/usermanager
JahiaSiteGroupManagerDBService.java
JahiaSiteUserManagerDBService.java
Log:
commons.logging -> log4j
Revision Changes Path
1.7 +2 -3
jahia/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java.diff?r1=1.6&r2=1.7&f=h
1.3 +0 -4
jahia/core/src/java/org/jahia/services/applications/J2UserManagerImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/J2UserManagerImpl.java.diff?r1=1.2&r2=1.3&f=h
1.3 +2 -6
jahia/core/src/java/org/jahia/services/applications/JahiaUserInfoManagerImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/JahiaUserInfoManagerImpl.java.diff?r1=1.2&r2=1.3&f=h
1.5 +3 -4
jahia/core/src/java/org/jahia/services/applications/PlutoServletRequestImpl.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/PlutoServletRequestImpl.java.diff?r1=1.4&r2=1.5&f=h
1.11 +2 -2
jahia/core/src/java/org/jahia/services/containers/ContentContainer.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/ContentContainer.java.diff?r1=1.10&r2=1.11&f=h
1.4 +2 -2
jahia/core/src/java/org/jahia/services/containers/ContentContainerTools.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/ContentContainerTools.java.diff?r1=1.3&r2=1.4&f=h
1.17 +2 -3
jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java.diff?r1=1.16&r2=1.17&f=h
1.21 +2 -3
jahia/core/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.20&r2=1.21&f=h
1.4 +2 -3
jahia/core/src/java/org/jahia/services/homepages/JahiaHomepagesBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/homepages/JahiaHomepagesBaseService.java.diff?r1=1.3&r2=1.4&f=h
1.4 +5 -6
jahia/core/src/java/org/jahia/services/lock/LockRegistry.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/lock/LockRegistry.java.diff?r1=1.3&r2=1.4&f=h
1.4 +3 -3
jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteGroupManagerDBService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteGroupManagerDBService.java.diff?r1=1.3&r2=1.4&f=h
1.7 +3 -3
jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java.diff?r1=1.6&r2=1.7&f=h
Index: JahiaACLManagerService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/acl/JahiaACLManagerService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaACLManagerService.java 22 Jun 2005 12:33:09 -0000 1.6
+++ JahiaACLManagerService.java 12 Jul 2005 07:19:43 -0000 1.7
@@ -42,8 +42,6 @@
package org.jahia.services.acl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jahia.data.JahiaDOMObject;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaInitializationException;
@@ -75,7 +73,8 @@
/**
* logging
*/
- private static final Log logger =
LogFactory.getLog(JahiaACLManagerService.class);
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(JahiaACLManagerService.class);
private static JahiaACLManagerService mACLService;
Index: J2UserManagerImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/J2UserManagerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- J2UserManagerImpl.java 23 Dec 2004 16:19:41 -0000 1.2
+++ J2UserManagerImpl.java 12 Jul 2005 07:19:43 -0000 1.3
@@ -9,8 +9,6 @@
import java.util.prefs.Preferences;
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.security.SecurityException;
import org.apache.jetspeed.security.User;
@@ -40,8 +38,6 @@
public class J2UserManagerImpl extends UserManagerImpl {
- private static final Log log =
LogFactory.getLog(J2UserManagerImpl.class);
-
public J2UserManagerImpl (SecurityProvider securityProvider) {
super(securityProvider);
}
Index: JahiaUserInfoManagerImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/JahiaUserInfoManagerImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JahiaUserInfoManagerImpl.java 5 Jul 2005 15:46:22 -0000 1.2
+++ JahiaUserInfoManagerImpl.java 12 Jul 2005 07:19:43 -0000 1.3
@@ -19,8 +19,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.UserAttributeRef;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
@@ -41,11 +39,9 @@
* </p>
*
* @author <a href="mailto:taylorapache.org";>David Sean Taylor</a>
- * @version $Id: JahiaUserInfoManagerImpl.java,v 1.2 2005/07/05 15:46:22
shuber Exp $
+ * @version $Id: JahiaUserInfoManagerImpl.java,v 1.3 2005/07/12 07:19:43
xlawrence Exp $
*/
-public class JahiaUserInfoManagerImpl extends AbstractUserInfoManagerImpl
implements UserInfoManager
-{
- private static final Log log =
LogFactory.getLog(JahiaUserInfoManagerImpl.class);
+public class JahiaUserInfoManagerImpl extends AbstractUserInfoManagerImpl
implements UserInfoManager {
private final static String FUSION_USER_INFO =
"org.apache.jetspeed.fusion.userinfo";
Index: PlutoServletRequestImpl.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/PlutoServletRequestImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PlutoServletRequestImpl.java 5 Jul 2005 15:46:22 -0000 1.4
+++ PlutoServletRequestImpl.java 12 Jul 2005 07:19:43 -0000 1.5
@@ -19,8 +19,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.engine.servlet.ServletRequestImpl;
import org.apache.jetspeed.request.JetspeedRequestContext;
import org.apache.pluto.om.common.SecurityRole;
@@ -39,13 +37,14 @@
import org.jahia.data.applications.EntryPointInstance;
/**
- * @version $Id: PlutoServletRequestImpl.java,v 1.4 2005/07/05 15:46:22
shuber Exp $
+ * @version $Id: PlutoServletRequestImpl.java,v 1.5 2005/07/12 07:19:43
xlawrence Exp $
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeremy Ford</a>
*/
public class PlutoServletRequestImpl extends ServletRequestImpl {
/** Logger */
- private static final Log log =
LogFactory.getLog(PlutoServletRequestImpl.class);
+ private static final org.apache.log4j.Logger log =
+ org.apache.log4j.Logger.getLogger(PlutoServletRequestImpl.class);
private PortletWindow portletWindow;
Index: ContentContainer.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/ContentContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ContentContainer.java 5 Jul 2005 15:46:24 -0000 1.10
+++ ContentContainer.java 12 Jul 2005 07:19:43 -0000 1.11
@@ -28,7 +28,6 @@
import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.hibernate.manager.JahiaContainerManager;
import org.jahia.hibernate.manager.JahiaContainerListManager;
-import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import java.io.Serializable;
@@ -47,7 +46,8 @@
public class ContentContainer extends ContentObject
implements PageReferenceableInterface, Cloneable, Serializable {
- private static org.apache.commons.logging.Log logger =
LogFactory.getLog(ContentContainer.class);
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(ContentContainer.class);
private List activeAndStagedEntryStates;
private List versionedEntryStates = null;
Index: ContentContainerTools.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/ContentContainerTools.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ContentContainerTools.java 22 Jun 2005 12:33:12 -0000 1.3
+++ ContentContainerTools.java 12 Jul 2005 07:19:44 -0000 1.4
@@ -40,7 +40,6 @@
package org.jahia.services.containers;
-import org.apache.commons.logging.LogFactory;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaInitializationException;
import org.jahia.services.cache.Cache;
@@ -58,7 +57,8 @@
class ContentContainerTools {
/** logging */
- final private org.apache.commons.logging.Log logger =
LogFactory.getLog(ContentContainerTools.class);
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(ContentContainerTools.class);
/** this class unique instance */
Index: JahiaContainersBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/containers/JahiaContainersBaseService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JahiaContainersBaseService.java 5 Jul 2005 15:46:24 -0000 1.16
+++ JahiaContainersBaseService.java 12 Jul 2005 07:19:44 -0000 1.17
@@ -71,8 +71,6 @@
import org.jahia.utils.xml.XMLSerializationOptions;
import org.jahia.utils.xml.XmlWriter;
import org.springframework.context.ApplicationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.io.IOException;
import java.util.*;
@@ -80,7 +78,8 @@
public class JahiaContainersBaseService extends JahiaContainersService {
/** logging */
- private static final Log logger =
LogFactory.getLog(JahiaContainersBaseService.class);
+ private static final org.apache.log4j.Logger logger =
+
org.apache.log4j.Logger.getLogger(JahiaContainersBaseService.class);
/**
* the service unique instance
Index: ContentField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentField.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ContentField.java 5 Jul 2005 15:46:25 -0000 1.20
+++ ContentField.java 12 Jul 2005 07:19:44 -0000 1.21
@@ -67,8 +67,6 @@
import org.jahia.services.version.RestoreVersionStateModificationContext;
import org.jahia.hibernate.manager.JahiaFieldsDataManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.io.IOException;
import java.io.Serializable;
@@ -81,7 +79,8 @@
public abstract class ContentField extends ContentObject
implements ACLResourceInterface, PageReferenceableInterface,
Serializable {
- private static Log logger = LogFactory.getLog(ContentField.class);
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(ContentField.class);
private static final String NO_VALUE = "<no_value>";
Index: JahiaHomepagesBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/homepages/JahiaHomepagesBaseService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaHomepagesBaseService.java 5 Jul 2005 15:46:27 -0000 1.3
+++ JahiaHomepagesBaseService.java 12 Jul 2005 07:19:44 -0000 1.4
@@ -16,8 +16,6 @@
//
package org.jahia.services.homepages;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jahia.data.JahiaDOMObject;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaInitializationException;
@@ -41,7 +39,8 @@
*/
public class JahiaHomepagesBaseService extends JahiaHomepagesService {
- private static Log logger =
LogFactory.getLog(JahiaHomepagesBaseService.class);
+ private static final org.apache.log4j.Logger logger =
+
org.apache.log4j.Logger.getLogger(JahiaHomepagesBaseService.class);
private static final String CLASS_NAME =
JahiaHomepagesBaseService.class.getName();
Index: LockRegistry.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/lock/LockRegistry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LockRegistry.java 22 Jun 2005 12:33:16 -0000 1.3
+++ LockRegistry.java 12 Jul 2005 07:19:45 -0000 1.4
@@ -24,8 +24,6 @@
import org.jahia.services.cache.CacheEntry;
import org.jahia.hibernate.manager.JahiaLockManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
*
@@ -49,6 +47,11 @@
public final static String STEALED = "stealed";
public final static String TIME_REMAINING = "timeRemaining";
public final static String TIMEOUT = "timeout";
+
+ private static LockRegistry lockRegistryInstance;
+
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(LockRegistry.class);
private JahiaLockManager manager;
@@ -400,8 +403,4 @@
private void removeAllLocks() {
manager.removeAllLocks();
}
-
- private static LockRegistry lockRegistryInstance;
-
- private static Log logger = LogFactory.getLog(LockRegistry.class);
}
\ No newline at end of file
Index: JahiaSiteGroupManagerDBService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteGroupManagerDBService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JahiaSiteGroupManagerDBService.java 22 Jun 2005 12:33:20 -0000
1.3
+++ JahiaSiteGroupManagerDBService.java 12 Jul 2005 07:19:45 -0000
1.4
@@ -20,8 +20,6 @@
import org.jahia.utils.JahiaTools;
import org.jahia.hibernate.manager.JahiaGroupManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -37,7 +35,9 @@
* @author Khue Ng
*/
public class JahiaSiteGroupManagerDBService extends
JahiaSiteGroupManagerService {
- private static Log logger =
LogFactory.getLog(JahiaSiteGroupManagerDBService.class);
+
+ private static final org.apache.log4j.Logger logger =
+
org.apache.log4j.Logger.getLogger(JahiaSiteGroupManagerDBService.class);
private static JahiaSiteGroupManagerDBService mInstance;
Index: JahiaSiteUserManagerDBService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JahiaSiteUserManagerDBService.java 22 Jun 2005 12:33:20 -0000
1.6
+++ JahiaSiteUserManagerDBService.java 12 Jul 2005 07:19:45 -0000
1.7
@@ -21,8 +21,6 @@
import org.jahia.utils.JahiaTools;
import org.jahia.hibernate.manager.JahiaUserManager;
import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -37,7 +35,9 @@
* @author Khue Ng
*/
public class JahiaSiteUserManagerDBService extends
JahiaSiteUserManagerService {
- private static Log logger =
LogFactory.getLog(JahiaSiteUserManagerDBService.class);
+
+ private static final org.apache.log4j.Logger logger =
+
org.apache.log4j.Logger.getLogger(JahiaSiteUserManagerDBService.class);
private static final String KEY_SEPARATOR = "###";
