[jboss-cvs] JBossAS SVN: r111530 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: naming and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 6 23:59:39 EDT 2011
Author: jeff.zhang
Date: 2011-06-06 23:59:39 -0400 (Mon, 06 Jun 2011)
New Revision: 111530
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/ExplicitJndiStrategy.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/NoopJndiStrategy.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/SimpleJndiStrategy.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java
Log:
[JBJCA-592] revovery and security log
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -365,5 +365,48 @@
*/
@LogMessage(level = ERROR)
@Message(id = 614, value = "Exception during createSubject() %s")
- public void exceptionDuringCreateSubject(String description, @Cause Throwable t);
+ public void exceptionDuringCreateSubject(String description, @Cause Throwable t);
+
+
+ // NAMING (700)
+
+ /**
+ * Exception during unbind
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 701, value = "Exception during unbind")
+ public void exceptionDuringUnbind(@Cause Throwable t);
+
+
+ // RESOURCE ADPATER REPOSITORY (800)
+
+
+ // RECOVERY (900)
+
+ /**
+ * Error during connection close
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 901, value = "Error during connection close")
+ public void exceptionDuringConnectionClose(@Cause Throwable t);
+
+
+ // SECURITY (1000)
+
+ /**
+ * No users.properties were found
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 1001, value = "No users.properties were found")
+ public void NoUsersPropertiesFound();
+
+ /**
+ * Error while loading users.properties
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 1002, value = "Error while loading users.properties")
+ public void errorWhileLoadingUsersProperties(@Cause Throwable t);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/ExplicitJndiStrategy.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/ExplicitJndiStrategy.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/ExplicitJndiStrategy.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.naming;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import java.util.Hashtable;
@@ -46,7 +47,7 @@
*/
public class ExplicitJndiStrategy implements JndiStrategy
{
- private static Logger log = Logger.getLogger(ExplicitJndiStrategy.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, ExplicitJndiStrategy.class.getName());
private static boolean trace = log.isTraceEnabled();
@@ -220,7 +221,7 @@
}
catch (Throwable t)
{
- log.warn("Exception during unbind", t);
+ log.exceptionDuringUnbind(t);
}
finally
{
@@ -385,7 +386,7 @@
}
catch (Throwable t)
{
- log.warn("Exception during unbind", t);
+ log.exceptionDuringUnbind(t);
}
finally
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/NoopJndiStrategy.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/NoopJndiStrategy.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/NoopJndiStrategy.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -29,8 +29,6 @@
import javax.naming.Context;
import javax.naming.Name;
-import org.jboss.logging.Logger;
-
/**
* A noop JNDI strategy
*
@@ -38,8 +36,6 @@
*/
public class NoopJndiStrategy implements JndiStrategy
{
- private static Logger log = Logger.getLogger(NoopJndiStrategy.class);
-
/**
* Constructor
*/
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/SimpleJndiStrategy.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/SimpleJndiStrategy.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/naming/SimpleJndiStrategy.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.naming;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import java.util.Hashtable;
@@ -49,7 +50,7 @@
*/
public class SimpleJndiStrategy implements JndiStrategy
{
- private static Logger log = Logger.getLogger(SimpleJndiStrategy.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, SimpleJndiStrategy.class.getName());
private static boolean trace = log.isTraceEnabled();
@@ -236,7 +237,7 @@
}
catch (Throwable t)
{
- log.warn("Exception during unbind", t);
+ log.exceptionDuringUnbind(t);
}
finally
{
@@ -408,7 +409,7 @@
}
catch (Throwable t)
{
- log.warn("Exception during unbind", t);
+ log.exceptionDuringUnbind(t);
}
finally
{
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.RequiredConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.ra15.Activationspec15;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.rar.Endpoint;
import org.jboss.jca.core.spi.rar.NotFoundException;
@@ -55,7 +56,8 @@
public class SimpleResourceAdapterRepository implements ResourceAdapterRepository
{
/** The logger */
- private static Logger log = Logger.getLogger(SimpleResourceAdapterRepository.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class,
+ SimpleResourceAdapterRepository.class.getName());
/** Resource adapters */
private Map<String, WeakReference<ResourceAdapter>> rars;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/recovery/DefaultRecoveryPlugin.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.recovery;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.recovery.RecoveryPlugin;
import java.lang.reflect.Method;
@@ -38,7 +39,7 @@
public class DefaultRecoveryPlugin implements RecoveryPlugin
{
/** Log instance */
- private static Logger log = Logger.getLogger(DefaultRecoveryPlugin.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, DefaultRecoveryPlugin.class.getName());
/**
* Constructor
@@ -88,7 +89,7 @@
}
catch (ResourceException re)
{
- log.warn("Error during connection close", re);
+ log.exceptionDuringConnectionClose(re);
throw new ResourceException("Error during connection close", re);
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java 2011-06-07 03:29:38 UTC (rev 111529)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/security/UsersRoles.java 2011-06-07 03:59:39 UTC (rev 111530)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.security;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.security.Callback;
import java.io.File;
@@ -51,7 +52,7 @@
private static final long serialVersionUID = 1L;
/** Log instance */
- private static Logger log = Logger.getLogger(UsersRoles.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, UsersRoles.class.getName());
/** Trace */
private static boolean trace = log.isTraceEnabled();
@@ -226,12 +227,12 @@
}
else
{
- log.warn("No users.properties were found");
+ log.NoUsersPropertiesFound();
}
}
catch (IOException ioe)
{
- log.error("Error while loading users.properties", ioe);
+ log.errorWhileLoadingUsersProperties(ioe);
}
finally
{
@@ -309,12 +310,12 @@
}
else
{
- log.warn("No roles.properties were found");
+ log.NoUsersPropertiesFound();
}
}
catch (IOException ioe)
{
- log.error("Error while loading roles.properties", ioe);
+ log.errorWhileLoadingUsersProperties(ioe);
}
finally
{
More information about the jboss-cvs-commits
mailing list