ISPN-4086 Use new package for JBoss Logging Annotations

Cotton-Ben · Mar 10, 2014 · 5039551 · 5039551
1 parent 6c6ca3a
commit 5039551
Show file tree

Hide file tree

Showing 22 changed files with 78 additions and 78 deletions.
diff --git a/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java b/cdi/extension/src/main/java/org/infinispan/cdi/util/logging/Log.java
@@ -2,10 +2,10 @@
 
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.INFO;
 

diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Log.java
@@ -10,10 +10,10 @@
 import org.infinispan.cli.interpreter.codec.CodecException;
 import org.infinispan.cli.interpreter.result.StatementException;
 import org.infinispan.commons.CacheException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Log abstraction for the ISPNCLIQL interpreter. For this module, message ids

diff --git a/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java b/cli/cli-server/src/main/java/org/infinispan/cli/interpreter/logging/Messages.java
@@ -1,7 +1,7 @@
 package org.infinispan.cli.interpreter.logging;
 
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageBundle;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
 
 /**
  * Informational CLI messages. These start from 19500 so as not to overlap with the logging messages defined in {@link Log}

diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/logging/Log.java
@@ -4,10 +4,10 @@
 import org.infinispan.client.hotrod.impl.transport.tcp.TcpTransport;
 import org.infinispan.commons.CacheConfigurationException;
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import java.io.IOException;
 import java.net.SocketAddress;

diff --git a/commons/src/main/java/org/infinispan/commons/logging/Log.java b/commons/src/main/java/org/infinispan/commons/logging/Log.java
@@ -5,10 +5,10 @@
 
 import org.infinispan.commons.CacheConfigurationException;
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Infinispan's log abstraction layer on top of JBoss Logging.

diff --git a/core/src/main/java/org/infinispan/util/logging/Log.java b/core/src/main/java/org/infinispan/util/logging/Log.java
@@ -20,10 +20,10 @@
 import org.infinispan.transaction.xa.recovery.RecoveryAwareTransaction;
 import org.infinispan.util.concurrent.TimeoutException;
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 import org.jgroups.View;
 
 import javax.management.InstanceAlreadyExistsException;

diff --git a/extended-statistics/src/main/java/org/infinispan/stats/logging/Log.java b/extended-statistics/src/main/java/org/infinispan/stats/logging/Log.java
@@ -2,10 +2,10 @@
 
 import org.infinispan.stats.container.ExtendedStatistic;
 import org.infinispan.stats.percentiles.PercentileStatistic;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;

diff --git a/jcache/src/main/java/org/infinispan/jcache/logging/Log.java b/jcache/src/main/java/org/infinispan/jcache/logging/Log.java
@@ -1,9 +1,9 @@
 package org.infinispan.jcache.logging;
 
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import javax.cache.CacheException;
 import javax.cache.configuration.Configuration;

diff --git a/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java b/lucene/lucene-v3/src/main/java/org/infinispan/lucene/logging/Log.java
@@ -4,10 +4,10 @@
 
 import org.infinispan.commons.CacheException;
 import org.infinispan.persistence.spi.PersistenceException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.WARN;

diff --git a/persistence/jdbc/src/main/java/org/infinispan/persistence/jdbc/logging/Log.java b/persistence/jdbc/src/main/java/org/infinispan/persistence/jdbc/logging/Log.java
@@ -2,10 +2,10 @@
 
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.persistence.support.Bucket;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import javax.naming.NamingException;
 import java.io.IOException;

diff --git a/persistence/leveldb/src/main/java/org/infinispan/persistence/leveldb/logging/Log.java b/persistence/leveldb/src/main/java/org/infinispan/persistence/leveldb/logging/Log.java
@@ -1,10 +1,10 @@
 package org.infinispan.persistence.leveldb.logging;
 
 import org.infinispan.persistence.spi.PersistenceException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.*;
 

diff --git a/persistence/remote/src/main/java/org/infinispan/persistence/remote/logging/Log.java b/persistence/remote/src/main/java/org/infinispan/persistence/remote/logging/Log.java
@@ -3,10 +3,10 @@
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.commons.CacheException;
 import org.infinispan.persistence.spi.PersistenceException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.*;
 

diff --git a/persistence/rest/src/main/java/org/infinispan/persistence/rest/logging/Log.java b/persistence/rest/src/main/java/org/infinispan/persistence/rest/logging/Log.java
@@ -27,10 +27,10 @@
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.commons.CacheException;
 import org.infinispan.persistence.spi.PersistenceException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Log abstraction for the rest cache store. For this module, message ids

diff --git a/query/src/main/java/org/infinispan/query/logging/Log.java b/query/src/main/java/org/infinispan/query/logging/Log.java
@@ -4,10 +4,10 @@
 
 import org.hibernate.search.backend.LuceneWork;
 import org.infinispan.remoting.transport.Address;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.*;
 

diff --git a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/logging/Log.java b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/logging/Log.java
@@ -1,9 +1,9 @@
 package org.infinispan.query.remote.logging;
 
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.*;
 

diff --git a/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java b/server/core/src/main/scala/org/infinispan/server/core/logging/JavaLog.java
@@ -2,10 +2,10 @@
 
 import io.netty.channel.Channel;
 import org.infinispan.commons.CacheConfigurationException;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import java.net.SocketAddress;
 

diff --git a/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java b/server/hotrod/src/main/scala/org/infinispan/server/hotrod/logging/JavaLog.java
@@ -2,10 +2,10 @@
 
 import org.infinispan.commons.CacheConfigurationException;
 import org.infinispan.util.concurrent.IsolationLevel;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.*;
 

diff --git a/server/integration/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JGroupsLogger.java b/server/integration/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JGroupsLogger.java
@@ -28,11 +28,11 @@
 import static org.jboss.logging.Logger.Level.WARN;
 
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.Logger;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Date: 29.08.2011

diff --git a/...er/integration/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JGroupsMessages.java b/...er/integration/jgroups/src/main/java/org/jboss/as/clustering/jgroups/JGroupsMessages.java
@@ -25,8 +25,8 @@
 import java.net.URL;
 
 import org.jboss.as.controller.OperationFailedException;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageBundle;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageBundle;
 import org.jboss.logging.Messages;
 
 /**

diff --git a/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java b/server/rest/src/main/scala/org/infinispan/rest/logging/JavaLog.java
@@ -2,10 +2,10 @@
 
 import static org.jboss.logging.Logger.Level.ERROR;
 
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Log abstraction for the REST server module. For this module, message ids

diff --git a/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java b/server/websocket/src/main/java/org/infinispan/server/websocket/logging/Log.java
@@ -1,6 +1,6 @@
 package org.infinispan.server.websocket.logging;
 
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Log abstraction for the websocket server. For this module, message ids

diff --git a/tree/src/main/java/org/infinispan/tree/logging/Log.java b/tree/src/main/java/org/infinispan/tree/logging/Log.java
@@ -1,6 +1,6 @@
 package org.infinispan.tree.logging;
 
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * Log abstraction for the tree module. For this module, message ids