[jboss-cvs] JBossAS SVN: r111564 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 9 12:07:21 EDT 2011
Author: jesper.pedersen
Date: 2011-06-09 12:07:21 -0400 (Thu, 09 Jun 2011)
New Revision: 111564
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonBundle.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreBundle.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersBundle.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml
Log:
New logging ids
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonBundle.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonBundle.java 2011-06-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonBundle.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -28,7 +28,7 @@
/**
* The common bundle.
*
- * Message ids ranging from 05001 to 10000 inclusively.
+ * Message ids ranging from 010000 to 019999 inclusively.
*/
@MessageBundle(projectCode = "IJ")
public interface CommonBundle
@@ -37,28 +37,28 @@
* Annotation repository is null
* @return The value
*/
- @Message(id = 5005, value = "AnnotationRepository reference is null")
+ @Message(id = 10051, value = "AnnotationRepository reference is null")
public String annotationRepositoryNull();
/**
* No @Connector defined
* @return The value
*/
- @Message(id = 5006, value = "No @Connector defined")
+ @Message(id = 10052, value = "No @Connector defined")
public String noConnectorDefined();
/**
* More than @Connector defined
* @return The value
*/
- @Message(id = 5007, value = "More than @Connector defined")
+ @Message(id = 10053, value = "More than @Connector defined")
public String moreThanOneConnectorDefined();
/**
* More than one @ConnectionDefinitions defined
* @return The value
*/
- @Message(id = 5008, value = "More than one @ConnectionDefinitions defined")
+ @Message(id = 10054, value = "More than one @ConnectionDefinitions defined")
public String moreThanOneConnectionDefinitionsDefined();
/**
@@ -66,7 +66,7 @@
* @param annotation The annotation
* @return The value
*/
- @Message(id = 5009, value = "Unknown annotation: %s")
+ @Message(id = 10055, value = "Unknown annotation: %s")
public String unknownAnnotation(Object annotation);
/**
@@ -75,7 +75,7 @@
* @param element The element
* @return The value
*/
- @Message(id = 5010, value = "%s isn't a valid boolean for element %s. " +
+ @Message(id = 10056, value = "%s isn't a valid boolean for element %s. " +
"We accept only \"true\" or \"false\" as boolean value")
public String elementAsBoolean(String value, String element);
@@ -85,7 +85,7 @@
* @param element The element
* @return The value
*/
- @Message(id = 5011, value = "%s isn't a valid boolean for attribute %s. " +
+ @Message(id = 10057, value = "%s isn't a valid boolean for attribute %s. " +
"We accept only \"true\" or \"false\" as boolean value")
public String attributeAsBoolean(String value, String element);
@@ -95,7 +95,7 @@
* @param element The element
* @return The value
*/
- @Message(id = 5012, value = "%s isn't a valid number for element %s")
+ @Message(id = 10058, value = "%s isn't a valid number for element %s")
public String notValidNumber(String value, String element);
/**
@@ -103,7 +103,7 @@
* @param value The value
* @return The value
*/
- @Message(id = 5013, value = "%s isn't a valid flush strategy")
+ @Message(id = 10059, value = "%s isn't a valid flush strategy")
public String notValidFlushStrategy(String value);
/**
@@ -111,7 +111,7 @@
* @param value The value
* @return The value
*/
- @Message(id = 5014, value = "Unexpected end tag: %s")
+ @Message(id = 10060, value = "Unexpected end tag: %s")
public String unexpectedEndTag(String value);
/**
@@ -119,14 +119,14 @@
* @param value The value
* @return The value
*/
- @Message(id = 5015, value = "Unexpected element: %s")
+ @Message(id = 10061, value = "Unexpected element: %s")
public String unexpectedElement(String value);
/**
* Unexpected end of document
* @return The value
*/
- @Message(id = 5016, value = "Reached end of xml document unexpectedly")
+ @Message(id = 10062, value = "Reached end of xml document unexpectedly")
public String unexpectedEndOfDocument();
/**
@@ -134,7 +134,7 @@
* @param value The value
* @return The value
*/
- @Message(id = 5017, value = "Mandatory class-name attribute missing in: %s")
+ @Message(id = 10063, value = "Mandatory class-name attribute missing in: %s")
public String missingClassName(String value);
/**
@@ -143,7 +143,7 @@
* @param location The location
* @return The value
*/
- @Message(id = 5018, value = "Unexpected attribute %s at %s")
+ @Message(id = 10064, value = "Unexpected attribute %s at %s")
public String unexpectedAttribute(String value, String location);
/**
@@ -151,14 +151,14 @@
* @param value The value
* @return The value
*/
- @Message(id = 5019, value = "Missing jndi-name mandatory attribute: %s")
+ @Message(id = 10065, value = "Missing jndi-name mandatory attribute: %s")
public String missingJndiName(String value);
/**
* Multiple pools
* @return The value
*/
- @Message(id = 5020, value = "You cannot define more than one pool or xa-pool in same connection-definition")
+ @Message(id = 10066, value = "You cannot define more than one pool or xa-pool in same connection-definition")
public String multiplePools();
/**
@@ -166,7 +166,7 @@
* @param value The value
* @return The value
*/
- @Message(id = 5021, value = "Element %s cannot be set without an xa-pool")
+ @Message(id = 10067, value = "Element %s cannot be set without an xa-pool")
public String unsupportedElement(String value);
/**
@@ -175,7 +175,7 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5022, value = "Missing required attribute %s in %s")
+ @Message(id = 10068, value = "Missing required attribute %s in %s")
public String requiredAttributeMissing(String attr, String tag);
/**
@@ -184,7 +184,7 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5023, value = "Missing required element %s in %s")
+ @Message(id = 10069, value = "Missing required element %s in %s")
public String requiredElementMissing(String element, String tag);
/**
@@ -192,7 +192,7 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5024, value = "Invalid negative value for %s")
+ @Message(id = 10070, value = "Invalid negative value for %s")
public String invalidNegative(String tag);
/**
@@ -200,7 +200,7 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5025, value = "%s is not valid. See exception for more details")
+ @Message(id = 10071, value = "%s is not valid. See exception for more details")
public String invalidTag(String tag);
/**
@@ -208,28 +208,28 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5026, value = "%s cannot be undefined")
+ @Message(id = 10072, value = "%s cannot be undefined")
public String nullValue(String tag);
/**
* Invalid security configuration
* @return The value
*/
- @Message(id = 5027, value = "Invalid <security> configuration")
+ @Message(id = 10073, value = "Invalid <security> configuration")
public String invalidSecurityConfiguration();
/**
* Resource adapter not defined
* @return The value
*/
- @Message(id = 5028, value = "The resource adapter metadata must be defined")
+ @Message(id = 10074, value = "The resource adapter metadata must be defined")
public String noMetadataForResourceAdapter();
/**
* Invalid metadata for resource adapter
* @return The value
*/
- @Message(id = 5029, value = "The resource adapter metadata must contain either an outbound or inbound configuration")
+ @Message(id = 10075, value = "The resource adapter metadata must contain either an outbound or inbound configuration")
public String invalidMetadataForResourceAdapter();
/**
@@ -237,6 +237,6 @@
* @param tag The tag
* @return The value
*/
- @Message(id = 5030, value = "%s must be defined")
+ @Message(id = 10076, value = "%s must be defined")
public String missingValue(String tag);
}
Modified: 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 2011-06-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/CommonLogger.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -44,7 +44,7 @@
* @param t The exception
*/
@LogMessage(level = ERROR)
- @Message(id = 5001, value = "Parsing error of ra.xml file: %s")
+ @Message(id = 10001, value = "Parsing error of ra.xml file: %s")
public void parsingErrorRaXml(String url, @Cause Throwable t);
/**
@@ -53,21 +53,21 @@
* @param t The exception
*/
@LogMessage(level = ERROR)
- @Message(id = 5002, value = "Parsing error of ironjacamar.xml file: %s")
+ @Message(id = 10002, value = "Parsing error of ironjacamar.xml file: %s")
public void parsingErrorIronJacamarXml(String url, @Cause Throwable t);
/**
* No connector
*/
@LogMessage(level = ERROR)
- @Message(id = 5003, value = "No @Connector was found and no definition in the ra.xml metadata either")
+ @Message(id = 10003, 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 = 5004, value = "More than one @Connector was found but the correct one " +
+ @Message(id = 10004, 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/core/src/main/java/org/jboss/jca/core/CoreBundle.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreBundle.java 2011-06-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreBundle.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -28,7 +28,7 @@
/**
* The core bundle.
*
- * Message ids ranging from 00001 to 05000 inclusively.
+ * Message ids ranging from 000000 to 009999 inclusively.
*/
@MessageBundle(projectCode = "IJ")
public interface CoreBundle
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-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -35,7 +35,7 @@
/**
* The core logger.
*
- * Message ids ranging from 00001 to 05000 inclusively.
+ * Message ids ranging from 000000 to 009999 inclusively.
*/
@MessageLogger(projectCode = "IJ")
public interface CoreLogger extends BasicLogger
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersBundle.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersBundle.java 2011-06-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersBundle.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -28,7 +28,7 @@
/**
* The deployers bundle.
*
- * Message ids ranging from 10001 to 15000 inclusively.
+ * Message ids ranging from 020000 to 029999 inclusively.
*/
@MessageBundle(projectCode = "IJ")
public interface DeployersBundle
@@ -38,7 +38,7 @@
* @param clz The class name
* @return The value
*/
- @Message(id = 10008, value = "Unable to start %s")
+ @Message(id = 20051, value = "Unable to start %s")
public String unableToStartResourceAdapter(String clz);
/**
@@ -46,21 +46,21 @@
* @param clz The class name
* @return The value
*/
- @Message(id = 10009, value = "Unable to associate %s")
+ @Message(id = 20052, value = "Unable to associate %s")
public String unableToAssociate(String clz);
/**
* Undefined managed connection factory
* @return The value
*/
- @Message(id = 10010, value = "ManagedConnectionFactory must be defined in class-name")
+ @Message(id = 20053, value = "ManagedConnectionFactory must be defined in class-name")
public String undefinedManagedConnectionFactory();
/**
* Undefined managed connection factory
* @return The value
*/
- @Message(id = 10011, value = "AdminObject must be defined in class-name")
+ @Message(id = 20054, value = "AdminObject must be defined in class-name")
public String undefinedAdminObject();
/**
@@ -68,7 +68,7 @@
* @param clz The class name
* @return The value
*/
- @Message(id = 10012, value = "Failed to bind admin object %s")
+ @Message(id = 20055, value = "Failed to bind admin object %s")
public String failedToBindAdminObject(String clz);
/**
@@ -76,6 +76,6 @@
* @param url The url
* @return The value
*/
- @Message(id = 10013, value = "Deployment failed: %s")
+ @Message(id = 20056, value = "Deployment failed: %s")
public String deploymentFailed(String url);
}
Modified: 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 2011-06-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java 2011-06-09 16:07:21 UTC (rev 111564)
@@ -35,7 +35,7 @@
/**
* The deployers logger.
*
- * Message ids ranging from 10001 to 15000 inclusively.
+ * Message ids ranging from 020000 to 029999 inclusively.
*/
@MessageLogger(projectCode = "IJ")
public interface DeployersLogger extends BasicLogger
@@ -47,7 +47,7 @@
* @param url The license url
*/
@LogMessage(level = INFO)
- @Message(id = 10001, value = "Required license terms for %s")
+ @Message(id = 20001, value = "Required license terms for %s")
public void requiredLicenseTerms(String url);
/**
@@ -55,7 +55,7 @@
* @param url The url
*/
@LogMessage(level = INFO)
- @Message(id = 10002, value = "Deployed: %s")
+ @Message(id = 20002, value = "Deployed: %s")
public void deployed(String url);
/**
@@ -64,7 +64,7 @@
* @param t The exception
*/
@LogMessage(level = WARN)
- @Message(id = 10003, value = "Failure during validation report generation: %s")
+ @Message(id = 20003, value = "Failure during validation report generation: %s")
public void validationReportFailure(String detail, @Cause Throwable t);
/**
@@ -72,7 +72,7 @@
* @param clz The class name
*/
@LogMessage(level = WARN)
- @Message(id = 10004, value = "Only one connection definition found with a mismatch in class-name: %s")
+ @Message(id = 20004, value = "Only one connection definition found with a mismatch in class-name: %s")
public void connectionDefinitionMismatch(String clz);
/**
@@ -80,14 +80,14 @@
* @param clz The class name
*/
@LogMessage(level = WARN)
- @Message(id = 10005, value = "Only one admin object found with a mismatch in class-name: %s")
+ @Message(id = 20005, 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")
+ @Message(id = 20006, value = "ConnectionFactory is null")
public void nullConnectionFactory();
/**
@@ -96,6 +96,6 @@
* @param t The exception
*/
@LogMessage(level = ERROR)
- @Message(id = 10007, value = "Exception during createSubject(): %s")
+ @Message(id = 20007, value = "Exception during createSubject(): %s")
public void subjectCreationError(String detail, @Cause Throwable t);
}
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-09 14:57:25 UTC (rev 111563)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml 2011-06-09 16:07:21 UTC (rev 111564)
@@ -3,7 +3,7 @@
<title>Logging codes</title>
<section id="logging_codes_core">
- <title>Core: 00001 - 05000</title>
+ <title>Core: 000000 - 009999</title>
<table frame="all">
<title>Logging codes for core</title>
@@ -20,22 +20,22 @@
</thead>
<tbody>
<row>
- <entry>00100</entry>
+ <entry>000100</entry>
<entry><code>INFO</code></entry>
<entry></entry>
</row>
<row>
- <entry>00101</entry>
+ <entry>000101</entry>
<entry><code>INFO</code></entry>
<entry></entry>
</row>
<row>
- <entry>00102</entry>
+ <entry>000102</entry>
<entry><code>INFO</code></entry>
<entry></entry>
</row>
<row>
- <entry>00103</entry>
+ <entry>000103</entry>
<entry><code>INFO</code></entry>
<entry></entry>
</row>
@@ -45,7 +45,7 @@
</section>
<section id="logging_codes_common">
- <title>Common: 05001 - 10000</title>
+ <title>Common: 010000 - 019999</title>
<table frame="all">
<title>Logging codes for common</title>
@@ -62,7 +62,7 @@
</thead>
<tbody>
<row>
- <entry>05001</entry>
+ <entry>010000</entry>
<entry></entry>
<entry></entry>
</row>
@@ -72,7 +72,7 @@
</section>
<section id="logging_codes_deployers">
- <title>Deployers: 10001 - 15000</title>
+ <title>Deployers: 020000 - 029999</title>
<table frame="all">
<title>Logging codes for common</title>
@@ -89,7 +89,7 @@
</thead>
<tbody>
<row>
- <entry>10001</entry>
+ <entry>20000</entry>
<entry></entry>
<entry></entry>
</row>
@@ -98,31 +98,4 @@
</table>
</section>
- <section id="logging_codes_adapters">
- <title>Adapters: 95001 - 99999</title>
-
- <table frame="all">
- <title>Logging codes for common</title>
- <tgroup cols="3" align="left" colsep="1" rowsep="1">
- <colspec colname="c1" colwidth="*"/>
- <colspec colname="c2" colwidth="*"/>
- <colspec colname="c2" colwidth="6*"/>
- <thead>
- <row>
- <entry align="left">Code</entry>
- <entry align="left">Level</entry>
- <entry align="left">Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>95001</entry>
- <entry></entry>
- <entry></entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-
</appendix>
More information about the jboss-cvs-commits
mailing list