[jboss-svn-commits] JBoss Portal SVN: r5684 - in trunk/cms/src/main/org/jboss/portal/cms: hibernate hibernate/state impl/jcr/command impl/jcr/jackrabbit

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-11-20 10:27:10 -0500 (Mon, 20 Nov 2006)
New Revision: 5684

Modified:
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
Log:
- removed log4j dependencies, where possible.

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -27,7 +27,6 @@
 import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
 import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
 import org.apache.jackrabbit.util.TransientFileFactory;
-import org.apache.log4j.Logger;
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -35,6 +34,7 @@
 import org.hibernate.Transaction;
 import org.jboss.portal.cms.util.HibernateUtil;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.logging.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -41,7 +41,7 @@
 import org.apache.jackrabbit.core.state.util.Serializer;
 import org.apache.jackrabbit.core.value.BLOBFileValue;
 import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.log4j.Logger;
+
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
@@ -50,6 +50,7 @@
 import org.hibernate.Transaction;
 import org.jboss.portal.cms.hibernate.HibernateStoreConstants;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.logging.Logger;
 
 import javax.jcr.PropertyType;
 import java.io.ByteArrayOutputStream;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -42,7 +42,7 @@
 import org.apache.jackrabbit.core.state.util.Serializer;
 import org.apache.jackrabbit.core.value.BLOBFileValue;
 import org.apache.jackrabbit.core.value.InternalValue;
-import org.apache.log4j.Logger;
+
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -54,6 +54,7 @@
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.portal.cms.hibernate.HibernateStoreConstants;
+import org.jboss.logging.Logger;
 
 import javax.jcr.PropertyType;
 import javax.management.MBeanServer;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -22,12 +22,13 @@
  ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
-import org.apache.log4j.Logger;
+
 import org.hibernate.Session;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Modification;
 import org.jboss.cache.TreeCache;
 import org.jboss.cache.loader.CacheLoader;
+import org.jboss.logging.Logger;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -22,7 +22,6 @@
  ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
-import org.apache.log4j.Logger;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -31,6 +30,7 @@
 import org.hibernate.cfg.Configuration;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.jboss.logging.Logger;
 
 import javax.naming.InitialContext;
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -22,11 +22,11 @@
  ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import org.apache.log4j.Logger;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.util.FileUtil;
+import org.jboss.logging.Logger;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-11-20 14:53:11 UTC (rev 5683)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-11-20 15:27:10 UTC (rev 5684)
@@ -33,9 +33,10 @@
 import org.apache.jackrabbit.core.nodetype.PropDef;
 import org.apache.jackrabbit.core.nodetype.PropDefImpl;
 import org.apache.jackrabbit.name.QName;
-import org.apache.log4j.Logger;
+
 import org.jboss.portal.cms.impl.jcr.JCRService;
 import org.jboss.portal.cms.util.RepositoryUtil;
+import org.jboss.logging.Logger;
 import org.xml.sax.InputSource;
 
 import javax.jcr.NamespaceRegistry;