[jboss-svn-commits] JBL Code SVN: r33671 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/scm/svn and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 28 09:44:01 EDT 2010
Author: Rikkola
Date: 2010-06-28 09:44:00 -0400 (Mon, 28 Jun 2010)
New Revision: 33671
Modified:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/ItemVersionIterator.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepositoryAdministrator.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/SvnActionFactory.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/resource/SvnResourceHandlerTest.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java
Log:
[#JBRULES-2555] Update slf4j to version 1.6.0
-changing log4j to slf4j
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/AssetItem.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -10,9 +10,10 @@
import javax.jcr.Property;
import javax.jcr.RepositoryException;
-import org.apache.log4j.Logger;
import org.drools.repository.events.StorageEventManager;
import org.drools.repository.utils.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The RuleItem class is used to abstract away the details of the underlying JCR
@@ -22,7 +23,7 @@
* @author btruitt
*/
public class AssetItem extends CategorisableItem {
- private Logger log = Logger.getLogger(AssetItem.class);
+ private Logger log = LoggerFactory.getLogger(AssetItem.class);
/**
* The name of the rule node type
*/
@@ -139,7 +140,7 @@
}
}
} catch (RepositoryException e) {
- log.error(e);
+ log.error(e.getMessage(), e);
throw new RulesRepositoryException(e);
}
}
@@ -152,7 +153,7 @@
Node ruleNode = getVersionContentNode();
return ruleNode.hasProperty(CONTENT_PROPERTY_BINARY_NAME);
} catch (RepositoryException e) {
- log.error(e);
+ log.error(e.getMessage(), e);
throw new RulesRepositoryException(e);
}
}
@@ -230,7 +231,7 @@
return getContent().getBytes();
}
} catch (Exception e) {
- log.error(e);
+ log.error(e.getMessage(), e);
if (e instanceof RuntimeException)
throw (RuntimeException) e;
throw new RulesRepositoryException(e);
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -9,7 +9,8 @@
import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The TagItem class abstracts away details of the underlying JCR repository.
@@ -17,7 +18,7 @@
* @author btruitt
*/
public class CategoryItem extends Item {
- private Logger log = Logger.getLogger(CategoryItem.class);
+ private Logger log = LoggerFactory.getLogger(CategoryItem.class);
/**
* The name of the tag node type
@@ -131,7 +132,7 @@
}
this.node.remove();
} catch ( RepositoryException e ) {
- log.error( e );
+ log.error("Unable to remove category item.", e );
}
}
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/Item.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -3,7 +3,8 @@
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -12,7 +13,7 @@
* @author btruitt
*/
public abstract class Item {
- static Logger log = Logger.getLogger(Item.class);
+ static Logger log = LoggerFactory.getLogger(Item.class);
/**
* The node within the repository that this item corresponds to
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/ItemVersionIterator.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/ItemVersionIterator.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/ItemVersionIterator.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -3,7 +3,8 @@
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements the Iterator interface, allowing iteration over the version history of versionableItem
@@ -12,7 +13,7 @@
* @author btruitt
*/
class ItemVersionIterator implements Iterator {
- private static final Logger log = Logger.getLogger(ItemVersionIterator.class);
+ private static final Logger log = LoggerFactory.getLogger(ItemVersionIterator.class);
private VersionableItem currentVersionableItem;
private int iterationType;
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/JackrabbitRepositoryConfigurator.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -11,7 +11,8 @@
import org.apache.jackrabbit.commons.cnd.CndImporter;
import org.apache.jackrabbit.core.TransientRepository;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This contains code to initialise the repository for jackrabbit.
@@ -20,7 +21,7 @@
*/
public class JackrabbitRepositoryConfigurator implements JCRRepositoryConfigurator {
- private static final Logger log = Logger.getLogger(JackrabbitRepositoryConfigurator.class);
+ private static final Logger log = LoggerFactory.getLogger(JackrabbitRepositoryConfigurator.class);
/* (non-Javadoc)
* @see org.drools.repository.RepositoryConfigurator#getJCRRepository()
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepositoryAdministrator.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepositoryAdministrator.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepositoryAdministrator.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -6,7 +6,8 @@
import javax.jcr.Session;
import javax.jcr.Workspace;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is for administering the rules repo.
@@ -17,7 +18,7 @@
*/
public class RulesRepositoryAdministrator {
- private static final Logger log = Logger.getLogger(RulesRepositoryAdministrator.class);
+ private static final Logger log = LoggerFactory.getLogger(RulesRepositoryAdministrator.class);
private final Session session;
@@ -73,10 +74,10 @@
}
}
catch(PathNotFoundException e) {
- log.error( e );
+ log.error( "Unable to clear rules repository.", e );
}
catch(RepositoryException e) {
- log.error( e );
+ log.error( "Unable to clear rules repository.", e );
}
}
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/StateItem.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -4,7 +4,8 @@
import javax.jcr.PropertyIterator;
import javax.jcr.RepositoryException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The StateItem represents the status of an asset.
@@ -15,7 +16,7 @@
*/
public class StateItem extends Item {
- private Logger log = Logger.getLogger( StateItem.class );
+ private Logger log = LoggerFactory.getLogger( StateItem.class );
/**
* All assets when created, or a new version saved, have a status of Draft.
@@ -79,7 +80,7 @@
}
this.node.remove();
} catch ( RepositoryException e ) {
- log.error( e );
+ log.error( "Unable to remove state item.", e );
}
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/SvnActionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/SvnActionFactory.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/scm/svn/SvnActionFactory.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -7,27 +7,22 @@
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Map.Entry;
-//import org.apache.log4j.Logger;
import org.drools.scm.DefaultScmEntry;
import org.drools.scm.ScmAction;
import org.drools.scm.ScmActionFactory;
import org.drools.scm.ScmEntry;
-
import org.drools.scm.log.ScmLogEntry;
import org.drools.scm.log.ScmLogEntry.Add;
import org.drools.scm.log.ScmLogEntry.Copy;
import org.drools.scm.log.ScmLogEntry.Delete;
import org.drools.scm.log.ScmLogEntry.Replaced;
import org.drools.scm.log.ScmLogEntry.Update;
-
import org.tmatesoft.svn.core.SVNCommitInfo;
import org.tmatesoft.svn.core.SVNDirEntry;
import org.tmatesoft.svn.core.SVNErrorCode;
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/resource/SvnResourceHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/resource/SvnResourceHandlerTest.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/resource/SvnResourceHandlerTest.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -1,16 +1,13 @@
package org.drools.resource;
import java.io.File;
-import java.net.URI;
import java.net.URL;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
-import org.drools.resource.RepositoryBean;
-import org.drools.resource.ResourceHandler;
-import org.drools.resource.SvnResourceHandler;
import org.drools.resource.util.SvnUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author James Williams (james.williams at redhat.com)
@@ -18,7 +15,7 @@
*/
public class SvnResourceHandlerTest extends TestCase {
- private static Logger logger = Logger.getLogger( SvnResourceHandlerTest.class );
+ private static Logger logger = LoggerFactory.getLogger( SvnResourceHandlerTest.class );
private static String svnUrl = "file:///D:/dev/trunk2/rule-resource-handler/target/test-classes/svn_repo";
private static String testFilePath = "D:/dev/trunk2/rule-resource-handler/target/test-classes/files";
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java 2010-06-28 12:46:47 UTC (rev 33670)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/scm/svn/SvnActionFactoryTest.java 2010-06-28 13:44:00 UTC (rev 33671)
@@ -17,7 +17,6 @@
import junit.framework.TestCase;
-//import org.apache.log4j.Logger;
import org.drools.scm.CompositeScmAction;
import org.drools.scm.ScmAction;
import org.drools.scm.ScmActionFactory;
More information about the jboss-svn-commits
mailing list