[jboss-svn-commits] JBL Code SVN: r33668 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/server/builder and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jun 28 06:24:07 EDT 2010
Author: Rikkola
Date: 2010-06-28 06:24:07 -0400 (Mon, 28 Jun 2010)
New Revision: 33668
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/SecurityServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.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/GuvnorAPIServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuvnorAPIServlet.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.RuleFlowContentModel;
import org.drools.guvnor.server.util.LoggingHelper;
@@ -43,13 +42,11 @@
*/
public class GuvnorAPIServlet extends HttpServlet {
- private static final Logger log = LoggingHelper.getLogger(GuvnorAPIServlet.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(GuvnorAPIServlet.class);
public void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- if (log.isDebugEnabled()) {
- log.debug("Incoming request for Guvnor API:" + request.getRequestURL());
- }
+ log.debug("Incoming request for Guvnor API:" + request.getRequestURL());
String action = request.getParameter("action");
if ("load".equals(action)) {
String uuid = request.getParameter("uuid");
@@ -74,11 +71,9 @@
log.error(e.getMessage(), e);
throw new ServletException(e.getMessage(), e);
}
- if (log.isDebugEnabled()) {
- log.debug("Sending model");
- log.debug(content);
- log.debug("End of sending model");
- }
+ log.debug("Sending model");
+ log.debug(content);
+ log.debug("End of sending model");
response.setContentLength(content.getBytes().length);
response.getOutputStream().write(content.getBytes());
response.getOutputStream().close();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -5,7 +5,6 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
import org.drools.guvnor.client.rpc.AnalysisReport;
import org.drools.guvnor.client.rpc.RepositoryService;
import org.drools.guvnor.client.rpc.RuleAsset;
@@ -30,7 +29,7 @@
*/
public class RepositoryServiceServlet extends RemoteServiceServlet implements RepositoryService {
- private static final Logger log = LoggingHelper.getLogger(RepositoryServiceServlet.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(RepositoryServiceServlet.class);
private static boolean testListenerInit = false;
/**
* This is used by the pass through methods below.
@@ -62,7 +61,7 @@
if (e.getCause() instanceof AuthorizationException) {
HttpServletResponse response = getThreadLocalResponse();
try {
- log.error(e.getCause());
+ log.error(e.getMessage(),e.getCause());
e.printStackTrace();
response.setContentType("text/plain");
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
@@ -73,14 +72,14 @@
ex);
}
} else if (e.getCause() instanceof RulesRepositoryException) {
- log.error(e.getCause());
+ log.error(e.getMessage(), e.getCause());
sendErrorMessage(e.getCause().getMessage());
} else {
if (e.getCause() != null) {
- log.error(e.getCause());
+ log.error(e.getMessage(),e.getCause());
e.printStackTrace();
} else {
- log.error(e);
+ log.error(e.getMessage(),e);
e.printStackTrace();
}
sendErrorMessage("Sorry, a technical error occurred. Please contact a system administrator.");
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/SecurityServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/SecurityServiceServlet.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/SecurityServiceServlet.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -1,19 +1,18 @@
package org.drools.guvnor.server;
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletResponse;
+
import org.drools.guvnor.client.rpc.SecurityService;
import org.drools.guvnor.client.rpc.UserSecurityContext;
import org.drools.guvnor.client.security.Capabilities;
import org.drools.guvnor.server.security.SecurityServiceImpl;
import org.drools.guvnor.server.util.LoggingHelper;
-import org.drools.repository.RulesRepositoryException;
import org.jboss.seam.security.AuthorizationException;
-import org.apache.log4j.Logger;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
/**
* Wrapper for GWT RPC.
* @author michaelneale
@@ -22,13 +21,13 @@
public class SecurityServiceServlet extends RemoteServiceServlet implements
SecurityService {
- private static final Logger log = LoggingHelper.getLogger(SecurityServiceServlet.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(SecurityServiceServlet.class);
SecurityService service = new SecurityServiceImpl();
@Override
protected void doUnexpectedFailure(Throwable e) {
if (e.getCause() instanceof AuthorizationException) {
- log.info(e);
+ log.info(e.getMessage(), e);
HttpServletResponse response = getThreadLocalResponse();
try {
response.setContentType("text/plain");
@@ -40,7 +39,7 @@
ex);
}
} else {
- log.error(e.getCause());
+ log.error(e.getMessage(), e.getCause());
super.doUnexpectedFailure(e);
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -46,7 +46,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.ISO8601;
-import org.apache.log4j.Logger;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
@@ -175,7 +174,7 @@
private static final DateFormat dateFormatter = DateFormat.getInstance();
- private static final Logger log = LoggingHelper.getLogger( ServiceImplementation.class );
+ private static final LoggingHelper log = LoggingHelper.getLogger( ServiceImplementation.class );
private MetaDataMapper metaDataMapper = new MetaDataMapper();
@@ -1817,7 +1816,7 @@
}
}
} catch ( Exception e ) {
- log.error( e );
+ log.error("Unable to build asset.", e );
result = new BuilderResult();
BuilderResultLine res = new BuilderResultLine();
@@ -1848,7 +1847,7 @@
repository.copyPackage( sourcePackageName,
destPackageName );
} catch ( RulesRepositoryException e ) {
- log.error( e );
+ log.error("Unable to copy package.", e );
throw e;
}
@@ -1915,7 +1914,7 @@
((ICanHasAttachment) handler).onAttachmentRemoved( item );
}
} catch ( IOException e ) {
- log.error( e );
+ log.error("Unable to remove asset attachment", e );
}
item.archiveItem( archive );
@@ -1932,7 +1931,7 @@
pkg.getName() );
} catch ( RulesRepositoryException e ) {
- log.error( e );
+ log.error("Unable to get item format.", e );
throw e;
}
}
@@ -1960,7 +1959,7 @@
item.remove();
repository.save();
} catch ( RulesRepositoryException e ) {
- log.error( e );
+ log.error("Unable to remove asset.", e );
throw e;
}
}
@@ -1987,7 +1986,7 @@
item.remove();
repository.save();
} catch ( RulesRepositoryException e ) {
- log.error( e );
+ log.error("Unable to remove package.", e );
throw e;
}
}
@@ -2078,7 +2077,7 @@
return result.toArray( new String[result.size()] );
} catch ( DroolsParserException e ) {
- log.error( e );
+ log.error("Unable to list rules in package", e );
return new String[0];
}
}
@@ -2209,11 +2208,11 @@
return deserKnowledgebase( item,
cl );
} catch ( ClassNotFoundException e ) {
- log.error( e );
+ log.error("Unable to load rule base.", e );
throw new DetailedSerializableException( "A required class was not found.",
e.getMessage() );
} catch ( Exception e ) {
- log.error( e );
+ log.error("Unable to load rule base.", e );
log.info( "...but trying to rebuild binaries..." );
try {
BuilderResult res = this.buildPackage( item,
@@ -2947,9 +2946,7 @@
}
}
}
- if ( log.isDebugEnabled() ) {
- log.debug( "constraints rules: " + constraintRules );
- }
+ log.debug( "constraints rules: " + constraintRules );
try{
if ( AssetFormats.DECISION_TABLE_GUIDED.equals( asset.metaData.format ) || AssetFormats.DECISION_SPREADSHEET_XLS.equals( asset.metaData.format ) ) {
return runner.verify( drl,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Properties;
-import org.apache.log4j.Logger;
import org.drools.builder.conf.DefaultPackageNameOption;
import org.drools.compiler.DroolsError;
import org.drools.compiler.DroolsParserException;
@@ -34,8 +33,8 @@
import org.drools.guvnor.server.contenthandler.ICompilable;
import org.drools.guvnor.server.contenthandler.IRuleAsset;
import org.drools.guvnor.server.selector.AssetSelector;
-import org.drools.guvnor.server.selector.SelectorManager;
import org.drools.guvnor.server.selector.BuiltInSelector;
+import org.drools.guvnor.server.selector.SelectorManager;
import org.drools.guvnor.server.util.LoggingHelper;
import org.drools.lang.descr.PackageDescr;
import org.drools.repository.AssetItem;
@@ -53,7 +52,7 @@
* @author Michael Neale
*/
public class ContentPackageAssembler {
- private static final Logger log = LoggingHelper.getLogger( ContentPackageAssembler.class );
+ private static final LoggingHelper log = LoggingHelper.getLogger( ContentPackageAssembler.class );
private PackageItem pkg;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -26,15 +26,14 @@
import java.net.URL;
import java.net.URLEncoder;
-import org.apache.log4j.Logger;
import org.drools.bpmn2.xml.BPMNSemanticModule;
import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.compiler.xml.XmlProcessReader;
+import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
import org.drools.guvnor.client.rpc.RuleAsset;
import org.drools.guvnor.client.rpc.RuleFlowContentModel;
-import org.drools.guvnor.server.GuvnorAPIServlet;
import org.drools.guvnor.server.builder.BRMSPackageBuilder;
import org.drools.guvnor.server.builder.RuleFlowContentModelBuilder;
import org.drools.guvnor.server.builder.RuleFlowProcessBuilder;
@@ -42,10 +41,7 @@
import org.drools.guvnor.server.util.LoggingHelper;
import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
import com.google.gwt.user.client.rpc.SerializableException;
@@ -53,7 +49,7 @@
implements
ICompilable {
- private static final Logger log = LoggingHelper.getLogger(BPMN2ProcessHandler.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(BPMN2ProcessHandler.class);
public void retrieveAssetContent(RuleAsset asset,
PackageItem pkg,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/RepositoryBackupServlet.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -19,8 +19,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -30,7 +30,6 @@
import org.drools.guvnor.server.util.FormData;
import org.drools.guvnor.server.util.LoggingHelper;
-import org.apache.log4j.Logger;
/**
*
@@ -41,7 +40,7 @@
*/
public class RepositoryBackupServlet extends RepositoryServlet {
- private static final Logger log = LoggingHelper.getLogger(RepositoryBackupServlet.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(RepositoryBackupServlet.class);
private static final long serialVersionUID = 400L;
// final FileManagerUtils uploadHelper = new FileManagerUtils();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/MailboxService.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -1,16 +1,17 @@
package org.drools.guvnor.server.repository;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.drools.guvnor.server.util.LoggingHelper;
+import org.drools.repository.AssetItem;
import org.drools.repository.RulesRepository;
-import org.drools.repository.AssetItem;
import org.drools.repository.UserInfo;
import org.drools.repository.UserInfo.InboxEntry;
-import org.drools.guvnor.server.util.LoggingHelper;
-import org.apache.log4j.Logger;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutorService;
-import java.util.*;
-
/**
* This service the "delivery" of messages to users inboxes for events.
* Ideally only one instance of this running at a time (at least on a node) to avoid doubling up.
@@ -19,7 +20,7 @@
*/
public class MailboxService {
- private static final Logger log = LoggingHelper.getLogger( MailboxService.class );
+ private static final LoggingHelper log = LoggingHelper.getLogger( MailboxService.class );
public static final String MAILMAN = "mailman";
private static ExecutorService executor = Executors.newSingleThreadExecutor();
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/LoggingHelper.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -2,15 +2,8 @@
import java.util.Date;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.ErrorHandler;
-import org.apache.log4j.spi.Filter;
-import org.apache.log4j.spi.LoggingEvent;
import org.drools.guvnor.client.rpc.LogEntry;
-import org.drools.guvnor.server.ServiceImplementation;
+import org.slf4j.LoggerFactory;
/**
* Collects messages for displaying in the GUI as well as providing a logger.
@@ -18,104 +11,91 @@
*
*/
public class LoggingHelper {
+ private final org.slf4j.Logger log;
- static final MessageList messages = new MessageList();
+ static final MessageList messages = new MessageList();
- public static LogEntry[] getMessages() {
- return messages.getMessages();
- }
+ public static LogEntry[] getMessages() {
+ return messages.getMessages();
+ }
- public static void cleanLog() {
- messages.cleanEntry();
- }
-
- public static Logger getLogger(Class cls) {
+ public static void cleanLog() {
+ messages.cleanEntry();
+ }
- Logger l = Logger.getLogger( cls );
+ public static LoggingHelper getLogger(Class< ? > cls) {
+ return new LoggingHelper( cls );
+ }
- l.addAppender(new Appender() {
+ private LoggingHelper(Class< ? > cls) {
+ log = LoggerFactory.getLogger( cls );
+ }
- public void addFilter(Filter arg0) {
- }
+ public void info(String message) {
+ log.info( message );
+ messages.add( message,
+ 1 );
+ }
- public void clearFilters() {
- }
+ public void info(String message,
+ Throwable error) {
+ log.info( message,
+ error );
+ messages.add( message + " " + error.getMessage(),
+ 1 );
+ }
- public void close() {
- }
+ public void debug(String message) {
+ log.debug( message );
+ }
- public void doAppend(LoggingEvent e) {
- LogEntry ev = new LogEntry();
- ev.message = e.getRenderedMessage();
- ev.timestamp = new Date();
- if (e.getLevel().equals(Level.ERROR)) {
- ev.severity = 0;
- messages.add(ev);
- } else if (e.getLevel().equals(Level.INFO)) {
- ev.severity = 1;
- messages.add(ev);
- }
- }
+ public void error(String message) {
+ log.error( message );
+ messages.add( message,
+ 0 );
+ }
- public ErrorHandler getErrorHandler() {
- return null;
- }
+ public void error(String message,
+ Throwable error) {
+ log.error( message,
+ error );
+ messages.add( message + " " + error.getMessage(),
+ 0 );
+ }
- public Filter getFilter() {
- return null;
- }
+ public void warn(String message) {
+ log.warn( message );
+ }
- public Layout getLayout() {
- return null;
- }
-
- public String getName() {
- return "guilogger";
- }
-
- public boolean requiresLayout() {
- return false;
- }
-
- public void setErrorHandler(ErrorHandler arg0) {
- }
-
- public void setLayout(Layout arg0) {
- }
-
- public void setName(String arg0) {
- }
-
- });
- return l;
-
- }
-
}
class MessageList {
- static int MAX = 500;
- LogEntry[] messages = new LogEntry[MAX];
- int current = 0;
-
- public MessageList() {
+ static int MAX = 500;
+ LogEntry[] messages = new LogEntry[MAX];
+ int current = 0;
- }
+ public MessageList() {
- public synchronized void add(LogEntry e) {
- if (current == MAX) {
- current = 0;
- }
- messages[current++] = e;
- }
+ }
- public LogEntry[] getMessages() {
- return messages;
- }
-
- public synchronized void cleanEntry() {
- messages = new LogEntry[MAX];
- }
+ public synchronized void add(String message,
+ int severity) {
+ LogEntry entry = new LogEntry();
+ entry.message = message;
+ entry.timestamp = new Date();
+ entry.severity = severity;
-}
+ if ( current == MAX ) {
+ current = 0;
+ }
+ messages[current++] = entry;
+ }
+ public LogEntry[] getMessages() {
+ return messages;
+ }
+
+ public synchronized void cleanEntry() {
+ messages = new LogEntry[MAX];
+ }
+}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java 2010-06-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/jboss/seam/security/permission/RoleBasedPermissionResolver.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -6,7 +6,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
import org.drools.guvnor.server.ServiceImplementation;
import org.drools.guvnor.server.security.AdminType;
import org.drools.guvnor.server.security.CategoryPathType;
@@ -56,7 +55,7 @@
implements
PermissionResolver,
Serializable {
- private static final Logger log = LoggingHelper.getLogger(RoleBasedPermissionResolver.class);
+ private static final LoggingHelper log = LoggingHelper.getLogger(RoleBasedPermissionResolver.class);
private boolean enableRoleBasedAuthorization = false;
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-27 22:01:14 UTC (rev 33667)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/LoggingHelperTest.java 2010-06-28 10:24:07 UTC (rev 33668)
@@ -7,45 +7,33 @@
public class LoggingHelperTest extends TestCase {
- public void testAppender() {
- Logger l = LoggingHelper.getLogger(LoggingHelperTest.class);
- Logger l_= LoggingHelper.getLogger(LoggingHelperTest.class);
- assertSame(l, l_);
- l_ = LoggingHelper.getLogger(TestCase.class);
-
- assertNotSame(l, l_);
- assertNotNull(l.getAppender("guilogger"));
- }
-
public void testMessages() throws Exception {
final MessageList ml = new MessageList();
- final LogEntry e = new LogEntry();
- e.message = "heh";
- ml.add(e);
+ ml.add("heh",0);
- assertEquals(e, ml.getMessages()[0]);
+ assertEquals("heh", ml.getMessages()[0].message);
for (int i = 0; i < 10000; i++) {
- ml.add(new LogEntry());
+ ml.add("entry "+i, 0);
}
LogEntry[] results = ml.getMessages();
for (int i = 0; i < results.length; i++) {
assertNotNull("" + i, results[i]);
- assertFalse(results[i] == e);
+ assertFalse(results[i].message.equals("heh"));
}
Thread t1 = new Thread(new Runnable() {
public void run() {
for (int i = 0; i < 10000; i++) {
- ml.add(new LogEntry());
+ ml.add("thread1 "+1,0);
}
LogEntry[] results = ml.getMessages();
for (int i = 0; i < results.length; i++) {
assertNotNull("" + i, results[i]);
- assertFalse(results[i] == e);
+ assertFalse(results[i].message.equals("heh"));
}
}
});
@@ -54,12 +42,12 @@
Thread t2 = new Thread(new Runnable() {
public void run() {
for (int i = 0; i < 10000; i++) {
- ml.add(new LogEntry());
+ ml.add("thread2 "+1,0);
}
LogEntry[] results = ml.getMessages();
for (int i = 0; i < results.length; i++) {
assertNotNull("" + i, results[i]);
- assertFalse(results[i] == e);
+ assertFalse(results[i].message.equals("heh"));
}
}
});
@@ -72,7 +60,7 @@
results = ml.getMessages();
for (int i = 0; i < results.length; i++) {
assertNotNull("" + i, results[i]);
- assertFalse(results[i] == e);
+ assertFalse(results[i].message.equals("heh"));
}
}
More information about the jboss-svn-commits
mailing list