[jboss-svn-commits] JBL Code SVN: r33670 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/server/files and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 28 08:46:48 EDT 2010
Author: Rikkola
Date: 2010-06-28 08:46:47 -0400 (Mon, 28 Jun 2010)
New Revision: 33670
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
Log:
[#GUVNOR-561] Change log4j to slf4j
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ContentManager.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -22,7 +22,8 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This configures the content handlers based on a props file.
@@ -30,7 +31,7 @@
*/
public class ContentManager {
- private static final Logger log = Logger.getLogger( ContentManager.class );
+ private static final Logger log = LoggerFactory.getLogger( ContentManager.class );
public static String CONTENT_CONFIG_PROPERTIES = "/contenthandler.properties";
private static ContentManager INSTANCE;
@@ -54,7 +55,7 @@
}
} catch (IOException e) {
- log.fatal("UNABLE to load content handlers. Ahem, nothing will actually work. Ignore subsequent errors until this is resolved.", e);
+ log.error("UNABLE to load content handlers. Ahem, nothing will actually work. Ignore subsequent errors until this is resolved.", e);
}
}
@@ -73,13 +74,13 @@
return (ContentHandler) Thread.currentThread().getContextClassLoader().loadClass( val ).newInstance();
} catch ( InstantiationException e ) {
- log.error( e );
+ log.error( "Unable to load content handler implementation.", e );
return null;
} catch ( IllegalAccessException e ) {
- log.error( e );
+ log.error( "Unable to load content handler implementation.", e );
return null;
} catch ( ClassNotFoundException e ) {
- log.error( e );
+ log.error( "Unable to load content handler implementation.", e );
return null;
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -220,10 +220,10 @@
BulkTestRunResult result = serv.runScenariosInPackage( pkg );
out.write( result.toString().getBytes() );
} catch ( DetailedSerializableException e ) {
- log.error( e );
+ log.error( "Unable to run scenarios.", e );
out.write( e.getMessage().getBytes() );
} catch ( SerializableException e ) {
- log.error( e );
+ log.error( "Unable to run scenarios.", e );
out.write( e.getMessage().getBytes() );
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryServlet.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -22,7 +22,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.security.auth.login.LoginException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.util.Base64;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
@@ -42,7 +43,7 @@
private static final long serialVersionUID = 400L;
// protected final FileManagerUtils uploadHelper = new FileManagerUtils();
- public static final Logger log = Logger.getLogger( RepositoryServlet.class );
+ public static final Logger log = LoggerFactory.getLogger( RepositoryServlet.class );
// protected RulesRepository getRepository() {
//
@@ -94,10 +95,10 @@
try {
action.a();
} catch (RuntimeException e) {
- log.error(e);
+ log.error(e.getMessage(), e);
throw e;
} catch (Exception e) {
- log.error(e);
+ log.error(e.getMessage(), e);
throw new RuntimeException(e);
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RestAPIServlet.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -29,7 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.util.Base64;
import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
import org.drools.repository.RulesRepository;
@@ -47,7 +48,7 @@
public class RestAPIServlet extends RepositoryServlet {
private static final long serialVersionUID = 500L;
- public static final Logger log = Logger.getLogger( RestAPIServlet.class );
+ public static final Logger log = LoggerFactory.getLogger( RestAPIServlet.class );
@Override
protected void doPost(final HttpServletRequest req,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MigrateRepository.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -9,8 +9,9 @@
import org.drools.repository.PackageIterator;
import org.drools.repository.RulesRepository;
import org.drools.compiler.xml.processes.RuleFlowMigrator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.log4j.Logger;
/**
* This class is used to migrate version 4 ruleflow assets in a version 4
@@ -34,7 +35,7 @@
*/
public class MigrateRepository {
- private static final Logger log = Logger.getLogger( MigrateRepository.class );
+ private static final Logger log = LoggerFactory.getLogger( MigrateRepository.class );
/*************************************************************************
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/DefaultAuthenticator.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -17,7 +17,8 @@
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.security.Identity;
@@ -29,7 +30,7 @@
@Name("defaultAuthenticator")
public class DefaultAuthenticator {
- private static final Logger log = Logger.getLogger( DefaultAuthenticator.class );
+ private static final Logger log = LoggerFactory.getLogger( DefaultAuthenticator.class );
public boolean authenticate() {
if (SecurityServiceImpl.GUEST_LOGIN.equals( Identity.instance().getCredentials().getUsername())) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/NilAuthenticator.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -17,7 +17,8 @@
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.seam.annotations.Name;
/**
@@ -28,7 +29,7 @@
@Name("nilAuthenticator")
public class NilAuthenticator {
- private static final Logger log = Logger.getLogger( NilAuthenticator.class );
+ private static final Logger log = LoggerFactory.getLogger( NilAuthenticator.class );
public boolean authenticate() {
log.info( "All users are guests.");
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/security/SecurityServiceImpl.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -25,7 +25,8 @@
import javax.security.auth.login.LoginException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.drools.core.util.DateUtils;
import org.drools.guvnor.client.rpc.SecurityService;
import org.drools.guvnor.client.rpc.UserSecurityContext;
@@ -45,7 +46,7 @@
SecurityService {
public static final String GUEST_LOGIN = "guest";
- private static final Logger log = Logger.getLogger( SecurityServiceImpl.class );
+ private static final Logger log = LoggerFactory.getLogger( SecurityServiceImpl.class );
static final Map<String, String> PREFERENCES = loadPrefs();
public boolean login(String userName,
@@ -75,7 +76,7 @@
try {
Identity.instance().authenticate();
} catch ( LoginException e ) {
- log.error( e );
+ log.error( "Unable to login.", e );
return false;
}
return Identity.instance().isLoggedIn();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/RuleBasedSelector.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -4,7 +4,8 @@
import java.io.InputStream;
import java.io.InputStreamReader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.drools.CheckedDroolsException;
import org.drools.RuleBase;
import org.drools.RuntimeDroolsException;
@@ -21,7 +22,7 @@
*/
public class RuleBasedSelector implements AssetSelector {
- private static final Logger log = Logger.getLogger( RuleBasedSelector.class );
+ private static final Logger log = LoggerFactory.getLogger( RuleBasedSelector.class );
String ruleFile;
@@ -37,10 +38,10 @@
try {
this.ruleBase = RuleBaseLoader.getInstance().loadFromReader( reader );
} catch ( CheckedDroolsException e ) {
- log.error( e );
+ log.error( "Unable to load rule base.", e );
throw new RuntimeDroolsException(e);
} catch ( IOException e ) {
- log.error( e );
+ log.error( "Unable to load rule base.", e );
throw new RuntimeDroolsException(e);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/selector/SelectorManager.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -9,13 +9,14 @@
import java.util.Properties;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.drools.repository.AssetItem;
public class SelectorManager {
- private static final Logger log = Logger.getLogger( SelectorManager.class );
+ private static final Logger log = LoggerFactory.getLogger( SelectorManager.class );
public static String SELECTOR_CONFIG_PROPERTIES = "/selectors.properties";
private static final SelectorManager INSTANCE = new SelectorManager(SELECTOR_CONFIG_PROPERTIES);
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2010-06-28 11:09:02 UTC (rev 33669)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2010-06-28 12:46:47 UTC (rev 33670)
@@ -2,7 +2,6 @@
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.drools.guvnor.client.rpc.LogEntry;
public class LoggingHelperTest extends TestCase {
More information about the jboss-svn-commits
mailing list