[jboss-cvs] JBossAS SVN: r111518 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 3 13:15:56 EDT 2011
Author: jesper.pedersen
Date: 2011-06-03 13:15:56 -0400 (Fri, 03 Jun 2011)
New Revision: 111518
Added:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/package.html
Modified:
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java
projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml
Log:
[JBJCA-592] Common and deployers logging
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/common/build.xml 2011-06-03 17:15:56 UTC (rev 111518)
@@ -42,8 +42,19 @@
optimize="${javac.optimize}"
includeAntRuntime="false">
<compilerarg value="-Xlint"/>
+ <compilerarg value="-AgeneratedTranslationFilesPath=${build.common.dir}"/>
</javac>
+ <javac srcdir="${build.common.dir}"
+ destdir="${build.common.dir}"
+ classpathref="sjc.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
+ </javac>
+
<copy todir="${build.common.dir}"
flatten="yes">
<fileset dir="src/main/resources/">
Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.common;
+
+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 static org.jboss.logging.Logger.Level.ERROR;
+
+/**
+ * The common logger.
+ *
+ * Message ids ranging from 05001 to 10000 inclusively.
+ */
+ at MessageLogger(projectCode = "IJ")
+public interface CommonLogger extends BasicLogger
+{
+ /**
+ * Parsing error for ra.xml
+ * @param url The url
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 05001, value = "Parsing error of ra.xml file: %s")
+ public void parsingErrorRaXml(String url, @Cause Throwable t);
+
+ /**
+ * Parsing error for ironjacamar.xml
+ * @param url The url
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 05002, value = "Parsing error of ironjacamar.xml file: %s")
+ public void parsingErrorIronJacamarXml(String url, @Cause Throwable t);
+
+ /**
+ * No connector
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 05003, value = "No @Connector was found and no definition in the ra.xml metadata either")
+ public void noConnector();
+
+ /**
+ * More than one connector
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 05004, value = "More than one @Connector was found but the correct one " +
+ "wasn't defined in the ra.xml metadata")
+ public void moreThanOneConnector();
+}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -22,6 +22,7 @@
package org.jboss.jca.common.annotations;
+import org.jboss.jca.common.CommonLogger;
import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.AuthenticationMechanism;
@@ -86,7 +87,7 @@
*/
public class Annotations
{
- private static Logger log = Logger.getLogger(Annotations.class);
+ private static CommonLogger log = Logger.getMessageLogger(CommonLogger.class, Annotations.class.getName());
private static boolean trace = log.isTraceEnabled();
@@ -200,8 +201,6 @@
ArrayList<AdminObject> adminObjs = processAdministeredObject(annotationRepository, classLoader,
configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.ADMIN_OBJECT));
- //log.debug("ConnectorMetadata " + md);
-
// @Connector
Connector conn = processConnector(annotationRepository, xmlResourceAdapterClass,
connectionDefinitions, configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.RA),
@@ -248,7 +247,7 @@
// JBJCA-240
if (xmlResourceAdapterClass == null || xmlResourceAdapterClass.equals(""))
{
- log.fatal("No @Connector was found and no definition in the ra.xml metadata either");
+ log.noConnector();
throw new ValidateException("No @Connector defined");
}
}
@@ -257,8 +256,7 @@
// JBJCA-240
if (xmlResourceAdapterClass == null || xmlResourceAdapterClass.equals(""))
{
- log.fatal("More than one @Connector was found but the correct one " +
- "wasn't defined in the ra.xml metadata");
+ log.moreThanOneConnector();
throw new ValidateException("More than one @Connector defined");
}
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.common.metadata;
+import org.jboss.jca.common.CommonLogger;
import org.jboss.jca.common.api.metadata.common.CommonPool;
import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.common.CommonXaPool;
@@ -60,7 +61,7 @@
public abstract class AbstractParser
{
/** The logger */
- private static Logger log = Logger.getLogger(AbstractParser.class);
+ private static CommonLogger log = Logger.getMessageLogger(CommonLogger.class, AbstractParser.class.getName());
/**
* convert an xml element in boolean value. Empty elements results with true (tag presence is sufficient condition)
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -22,6 +22,7 @@
package org.jboss.jca.common.metadata;
+import org.jboss.jca.common.CommonLogger;
import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.metadata.ironjacamar.IronJacamarParser;
@@ -42,7 +43,7 @@
*/
public class MetadataFactory
{
- private static Logger log = Logger.getLogger(MetadataFactory.class);
+ private static CommonLogger log = Logger.getMessageLogger(CommonLogger.class, MetadataFactory.class.getName());
/**
* Constructor
@@ -74,13 +75,10 @@
result = (new RaParser()).parse(input);
log.debugf("Total parse for %s took %d ms", url, (System.currentTimeMillis() - start));
-
- //log.tracef("successufully deployed $s", result.toString());
-
}
catch (Exception e)
{
- log.errorf(e, "Error during parsing: %s", url);
+ log.parsingErrorRaXml(url, e);
throw e;
}
finally
@@ -122,12 +120,10 @@
result = (new IronJacamarParser()).parse(input);
log.debugf("Total parse for %s took %d ms", url, (System.currentTimeMillis() - start));
-
- log.tracef("successufully deployed %s", result.toString());
}
catch (Exception e)
{
- log.error("Error during parsing: " + url, e);
+ log.parsingErrorIronJacamarXml(url, e);
throw e;
}
finally
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/build.xml 2011-06-03 17:15:56 UTC (rev 111518)
@@ -43,7 +43,19 @@
optimize="${javac.optimize}"
includeAntRuntime="false">
<compilerarg value="-Xlint"/>
+ <compilerarg value="-AgeneratedTranslationFilesPath=${build.deployers.dir}/impl"/>
+ </javac>
+
+ <javac srcdir="${build.deployers.dir}/impl"
+ destdir="${build.deployers.dir}/impl"
+ classpathref="sjc.lib.path.id"
+ debug="${javac.debug}"
+ deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ includeAntRuntime="false">
+ <compilerarg value="-Xlint"/>
</javac>
+
</target>
<!-- =================================
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.deployers;
+
+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 static org.jboss.logging.Logger.Level.ERROR;
+import static org.jboss.logging.Logger.Level.INFO;
+import static org.jboss.logging.Logger.Level.WARN;
+
+/**
+ * The deployers logger.
+ *
+ * Message ids ranging from 10001 to 15000 inclusively.
+ */
+ at MessageLogger(projectCode = "IJ")
+public interface DeployersLogger extends BasicLogger
+{
+ // ABSTRACT RESOURCE ADAPTER DEPLOYER
+
+ /**
+ * Required license terms
+ * @param url The license url
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 10001, value = "Required license terms for %s")
+ public void requiredLicenseTerms(String url);
+
+ /**
+ * Deployed
+ * @param url The url
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 10002, value = "Deployed: %s")
+ public void deployed(String url);
+
+ /**
+ * Validation report failure
+ * @param detail The details
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 10003, value = "Failure during validation report generation: %s")
+ public void validationReportFailure(String detail, @Cause Throwable t);
+
+ /**
+ * Connection definition mismatch
+ * @param clz The class name
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 10004, value = "Only one connection definition found with a mismatch in class-name: %s")
+ public void connectionDefinitionMismatch(String clz);
+
+ /**
+ * Admin object mismatch
+ * @param clz The class name
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 10005, value = "Only one admin object found with a mismatch in class-name: %s")
+ public void adminObjectMismatch(String clz);
+
+ /**
+ * Null connection factory
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 10006, value = "ConnectionFactory is null")
+ public void nullConnectionFactory();
+
+ /**
+ * Subject ceration error
+ * @param detail The details
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 10007, value = "Exception during createSubject(): %s")
+ public void subjectCreationError(String detail, @Cause Throwable t);
+}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -52,6 +52,7 @@
import org.jboss.jca.core.spi.transaction.TransactionIntegration;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.lang.reflect.Method;
import java.net.URL;
@@ -69,7 +70,6 @@
import javax.resource.spi.security.PasswordCredential;
import javax.security.auth.Subject;
-import org.jboss.logging.Logger;
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
@@ -84,7 +84,7 @@
public abstract class AbstractDsDeployer
{
/** log **/
- protected Logger log;
+ protected DeployersLogger log;
/** The transaction integration */
protected TransactionIntegration transactionIntegration;
@@ -931,7 +931,7 @@
* Get the logger
* @return The value
*/
- protected abstract Logger getLogger();
+ protected abstract DeployersLogger getLogger();
/**
* Create a subject
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -57,6 +57,7 @@
import org.jboss.jca.core.spi.recovery.RecoveryPlugin;
import org.jboss.jca.core.spi.transaction.TransactionIntegration;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
+import org.jboss.jca.deployers.DeployersLogger;
import org.jboss.jca.validator.Failure;
import org.jboss.jca.validator.FailureHelper;
import org.jboss.jca.validator.Key;
@@ -99,7 +100,6 @@
import javax.security.auth.Subject;
import javax.transaction.TransactionManager;
-import org.jboss.logging.Logger;
import org.jboss.security.SecurityContext;
import org.jboss.security.SecurityContextAssociation;
import org.jboss.security.SecurityContextFactory;
@@ -113,7 +113,7 @@
public abstract class AbstractResourceAdapterDeployer
{
/** the logger **/
- protected final Logger log;
+ protected final DeployersLogger log;
/** trace boolean check */
protected final boolean trace;
@@ -249,7 +249,7 @@
}
catch (IOException ioe)
{
- log.warn(ioe.getMessage(), ioe);
+ log.validationReportFailure(ioe.getMessage(), ioe);
}
finally
{
@@ -394,7 +394,7 @@
if (cd.getClassName() != null && !clz.equals(cd.getClassName()))
{
- log.warn("Only one connection definition found with a mismatch in class-name: " + cd);
+ log.connectionDefinitionMismatch(cd.getClassName());
return null;
}
@@ -433,7 +433,7 @@
if (cao.getClassName() != null && !clz.equals(cao.getClassName()))
{
- log.warn("Only one admin object found with a mismatch in class-name: " + cao);
+ log.adminObjectMismatch(cao.getClassName());
return null;
}
@@ -760,7 +760,7 @@
{
// Notify regarding license terms
if (cmd != null && cmd.getLicense() != null && cmd.getLicense().isLicenseRequired())
- log.info("Required license terms for " + url.toExternalForm());
+ log.requiredLicenseTerms(url.toExternalForm());
String mgtUniqueId = url.getFile();
if (mgtUniqueId.indexOf("/") != -1)
@@ -1067,7 +1067,7 @@
if (cf == null)
{
- log.error("ConnectionFactory is null");
+ log.nullConnectionFactory();
}
else
{
@@ -1527,7 +1527,7 @@
if (cf == null)
{
- log.error("ConnectionFactory is null");
+ log.nullConnectionFactory();
}
else
{
@@ -1733,7 +1733,7 @@
if (activateDeployment)
{
- log.info("Deployed: " + url.toExternalForm());
+ log.deployed(url.toExternalForm());
}
else
{
@@ -1862,7 +1862,7 @@
}
catch (Throwable t)
{
- log.error("Exception during createSubject()" + t.getMessage(), t);
+ log.subjectCreationError(t.getMessage(), t);
}
return null;
@@ -2050,5 +2050,5 @@
* Get the logger
* @return The value
*/
- protected abstract Logger getLogger();
+ protected abstract DeployersLogger getLogger();
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -22,6 +22,8 @@
package org.jboss.jca.deployers.common;
+import org.jboss.jca.deployers.DeployersLogger;
+
import java.util.Arrays;
import java.util.List;
import java.util.Set;
@@ -44,7 +46,7 @@
*/
public class BeanValidation
{
- private static Logger log = Logger.getLogger(BeanValidation.class);
+ private static DeployersLogger log = Logger.getMessageLogger(DeployersLogger.class, BeanValidation.class.getName());
private static boolean trace = log.isTraceEnabled();
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -24,14 +24,13 @@
import org.jboss.jca.core.api.management.Connector;
import org.jboss.jca.core.api.management.DataSource;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
+import org.jboss.jca.deployers.DeployersLogger;
import java.net.URL;
import java.util.Arrays;
import javax.resource.spi.ResourceAdapter;
-import org.jboss.logging.Logger;
-
/**
*
* A CommonDeployment.
@@ -68,7 +67,7 @@
private final ClassLoader cl;
- private final Logger log;
+ private final DeployersLogger log;
/**
* Create a new Deployment.
@@ -94,7 +93,7 @@
Object[] aos, String[] aoJndiNames,
XAResourceRecovery[] recoveryModules,
Connector connector, DataSource[] dataSources,
- ClassLoader cl, Logger log)
+ ClassLoader cl, DeployersLogger log)
{
super();
this.url = url;
@@ -244,7 +243,7 @@
*
* @return the log.
*/
- public final Logger getLog()
+ public final DeployersLogger getLog()
{
return log;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalDeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -29,6 +29,7 @@
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.io.Closeable;
import java.io.IOException;
@@ -50,7 +51,7 @@
public abstract class AbstractFungalDeployment implements Deployment
{
/** The logger */
- protected Logger log;
+ protected DeployersLogger log;
/** The deployment */
protected URL deployment;
@@ -141,7 +142,7 @@
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
- ClassLoader cl, Logger log)
+ ClassLoader cl, DeployersLogger log)
{
this.deployment = deployment;
this.deploymentName = deploymentName;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -35,6 +35,7 @@
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.mdr.NotFoundException;
import org.jboss.jca.core.spi.naming.JndiStrategy;
+import org.jboss.jca.deployers.DeployersLogger;
import org.jboss.jca.deployers.common.AbstractDsDeployer;
import org.jboss.jca.deployers.common.CommonDeployment;
@@ -71,7 +72,7 @@
public final class DsXmlDeployer extends AbstractDsDeployer implements Deployer
{
/** The logger */
- private static Logger log = Logger.getLogger(DsXmlDeployer.class);
+ private static DeployersLogger log = Logger.getMessageLogger(DeployersLogger.class, DsXmlDeployer.class.getName());
/** jdbcLocal **/
private String jdbcLocal;
@@ -152,7 +153,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected DeployersLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -28,6 +28,7 @@
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.io.Closeable;
import java.io.IOException;
@@ -48,7 +49,8 @@
public class DsXmlDeployment implements Deployment
{
/** The logger */
- private static Logger log = Logger.getLogger(DsXmlDeployment.class);
+ private static DeployersLogger log =
+ Logger.getMessageLogger(DeployersLogger.class, DsXmlDeployment.class.getName());
/** The deployment */
private URL deployment;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -28,6 +28,7 @@
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
+import org.jboss.jca.deployers.DeployersLogger;
import org.jboss.jca.deployers.common.CommonDeployment;
import java.io.File;
@@ -54,10 +55,10 @@
public final class RAActivator extends AbstractFungalRADeployer implements DeployerPhases
{
/** The logger */
- static Logger log = Logger.getLogger(RAActivator.class);
+ private static DeployersLogger log = Logger.getMessageLogger(DeployersLogger.class, RAActivator.class.getName());
/** Trace enabled */
- static boolean trace = log.isTraceEnabled();
+ private static boolean trace = log.isTraceEnabled();
/** Enabled */
private boolean enabled;
@@ -82,7 +83,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected DeployersLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivatorDeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -29,6 +29,7 @@
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.net.URL;
import java.util.List;
@@ -37,8 +38,6 @@
import javax.management.ObjectName;
import javax.resource.spi.ResourceAdapter;
-import org.jboss.logging.Logger;
-
/**
* A resource adapter activator deployment for JCA/SJC
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
@@ -75,7 +74,7 @@
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
- ClassLoader cl, Logger log)
+ ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, true, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAConfiguration.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -35,18 +35,12 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.jboss.logging.Logger;
-
/**
* A configuration for the resource adapter deployer chain
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class RAConfiguration implements Configuration
{
- private static Logger log = Logger.getLogger(RAConfiguration.class);
-
- private static boolean trace = log.isTraceEnabled();
-
/** The transaction integration */
private TransactionIntegration transactionIntegration = null;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -38,6 +38,7 @@
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
+import org.jboss.jca.deployers.DeployersLogger;
import org.jboss.jca.deployers.common.CommonDeployment;
import java.io.File;
@@ -69,7 +70,7 @@
public final class RADeployer extends AbstractFungalRADeployer implements Deployer, MultiStageDeployer, DeployerOrder
{
/** The logger */
- private static Logger log = Logger.getLogger(RADeployer.class);
+ private static DeployersLogger log = Logger.getMessageLogger(DeployersLogger.class, RADeployer.class.getName());
/**
* Constructor
@@ -82,7 +83,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected DeployersLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -29,6 +29,7 @@
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.io.File;
import java.io.IOException;
@@ -39,8 +40,6 @@
import javax.management.ObjectName;
import javax.resource.spi.ResourceAdapter;
-import org.jboss.logging.Logger;
-
import com.github.fungal.api.util.FileUtil;
/**
@@ -86,7 +85,7 @@
File tmpDirectory,
ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
- ClassLoader cl, Logger log)
+ ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, activator, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -30,6 +30,7 @@
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
+import org.jboss.jca.deployers.DeployersLogger;
import org.jboss.jca.deployers.common.CommonDeployment;
import java.io.File;
@@ -65,7 +66,7 @@
DeployerOrder,
DeployerPhases
{
- private static Logger log = Logger.getLogger(RaXmlDeployer.class);
+ private static DeployersLogger log = Logger.getMessageLogger(DeployersLogger.class, RaXmlDeployer.class.getName());
/** The list of generated deployments */
private List<Deployment> deployments;
@@ -81,7 +82,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected DeployersLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployment.java 2011-06-03 17:15:56 UTC (rev 111518)
@@ -30,6 +30,7 @@
import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecovery;
import org.jboss.jca.core.spi.transaction.recovery.XAResourceRecoveryRegistry;
+import org.jboss.jca.deployers.DeployersLogger;
import java.net.URL;
import java.util.List;
@@ -38,8 +39,6 @@
import javax.management.ObjectName;
import javax.resource.spi.ResourceAdapter;
-import org.jboss.logging.Logger;
-
/**
* A -ra.xml deployment for JCA/SJC
* @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
@@ -81,7 +80,7 @@
XAResourceRecovery[] recoveryModules, XAResourceRecoveryRegistry recoveryRegistry,
ManagementRepository managementRepository, Connector connector,
MBeanServer server, List<ObjectName> objectNames,
- ClassLoader cl, Logger log)
+ ClassLoader cl, DeployersLogger log)
{
super(deployment, deploymentName, true, ra, raKey, jndiStrategy, mdr, resourceAdapterRepository,
cfs, cfJndis, aos, aoJndis, recoveryModules, recoveryRegistry, managementRepository,
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/package.html
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/package.html (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/package.html 2011-06-03 17:15:56 UTC (rev 111518)
@@ -0,0 +1,3 @@
+<body>
+Shared classes for all deployer implementations.
+</body>
Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml 2011-06-03 13:46:21 UTC (rev 111517)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml 2011-06-03 17:15:56 UTC (rev 111518)
@@ -99,7 +99,7 @@
</section>
<section id="logging_codes_adapters">
- <title>Adapters: 90001 - 99999</title>
+ <title>Adapters: 95001 - 99999</title>
<table frame="all">
<title>Logging codes for common</title>
@@ -116,7 +116,7 @@
</thead>
<tbody>
<row>
- <entry>90001</entry>
+ <entry>95001</entry>
<entry></entry>
<entry></entry>
</row>
More information about the jboss-cvs-commits
mailing list