This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Compiler assisted localization library". The branch, master has been updated via ae0134494d3c787208b8f574fbee901db9f01c0f (commit) from 268749b09993fdb1487c7108b724aae54d1db2eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=cal10n.git;a=commit;h=ae0134494d3c787208b8f574fb... http://github.com/ceki/cal10n/commit/ae0134494d3c787208b8f574fbee901db9f01c0... commit ae0134494d3c787208b8f574fbee901db9f01c0f Author: Ceki Gulcu <ceki@qos.ch> Date: Tue Sep 1 17:35:16 2009 +0200 - We now talk about message "keys" instead of message "codes" - added link to log4j manual diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java b/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java index 53fb1b6..14c4275 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java @@ -29,7 +29,7 @@ import java.text.MessageFormat; // which locale to use. /** - * Retrieve a message by its code as specified by an enum. + * Retrieve a localized message by its key as specified by an enum. * * <p> * The strategy in retrieving messages may vary from implementation to @@ -40,11 +40,11 @@ import java.text.MessageFormat; public interface IMessageConveyor { /** - * Retrieve a message by its code as specified by an enum. + * Retrieve a localized message by its key as specified by an enum. * * <p> * Note that any further arguments passed in 'args' will be interpolated using - * the translated message. The interpolation will be done according to + * the translated message. The interpolation will be done by and according to * conventions of {@link MessageFormat}. * * @param <E> @@ -59,10 +59,14 @@ public interface IMessageConveyor { /** * Syntactic sugar for the case where the massage is contained in a - * {@link MessageParameterObj}. + * {@link MessageParameterObj}. * - * <p>Equivalent to calling - * <pre>getMessage(mpo.getKey(), mpo.getArgs());</pre> + * <p> + * Equivalent to calling + * + * <pre> + * getMessage(mpo.getKey(), mpo.getArgs()); + * </pre> * * @see #getMessage(Enum, Object...) * @param mpo diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleNames.java b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleNames.java index 20e2b14..db6602b 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/LocaleNames.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/LocaleNames.java @@ -45,13 +45,13 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; * * <p> * In the above example, @LocaleNames({"en", "jp"}) means that there are English - * (en) and Japanese translations for the message codes found the Colors enum. - * The name of the corresponding resource bundle named "colors". + * (en) and Japanese translations for the message keys found in the Colors enum. + * The name of the corresponding resource bundle is named "colors". * * <p> - * Verification tools such {@link MessageKeyVerifier} can thus conclude that - * the resource bundle files <em>colors_en.properties</em> and - * <em>colors_jp.properties</em> exist and should be checked against the codes + * Verification tools such {@link MessageKeyVerifier} can thus conclude that the + * resource bundle files <em>colors_en.properties</em> and + * <em>colors_jp.properties</em> should exist and checked against the keys * defined in the Colors enum. * * @author Ceki Gülcü diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java index b8670b3..dc8a95a 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java @@ -70,7 +70,7 @@ public class MessageConveyor implements IMessageConveyor { .getClass()); if (resouceBundleName == null) { throw new IllegalArgumentException( - "Missing ResourceBundleAnnotation in [" + key.getClass().getName() + "Missing @ResourceBundleName annotation in enum type [" + key.getClass().getName() + "]. See also " + Cal10nConstants.MISSING_RB_ANNOTATION_URL); } ResourceBundle rb = ResourceBundle.getBundle(resouceBundleName, locale); diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/MessageParameterObj.java b/cal10n-api/src/main/java/ch/qos/cal10n/MessageParameterObj.java index ff5101b..7dca602 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/MessageParameterObj.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageParameterObj.java @@ -26,12 +26,12 @@ import java.util.Arrays; /** * Holds data relevant for a deferred message lookup. This is useful when the - * appropriate locale is unknown at the time or place where the message key and - * message args are emitted. For example, a low level library might emit a - * localized message but it is only at the UI (user interface) layer that the - * locale is known. As another example, imagine that the host where the + * appropriate locale is <em>unknown</em> at the time or place where the message + * key and message args are emitted. For example, a low level library might wish + * to emit a localized message but it is only at the UI (user interface) layer + * that the locale is known. As another example, imagine that the host where the * localized messages are presented to the user is in a different locale, e.g. - * Japan, than the source host. e.g. US. + * Japan, than the locale of the source host. e.g. US. * * <p> * Instances of this class are intended to be immutable, subject to the @@ -49,8 +49,8 @@ public class MessageParameterObj { /** * Constructs an instance. * - * @param code - * the code for the corresponding resource. + * @param key + * the key for the localized message. * @param args * any message parameters, as required. */ @@ -72,7 +72,7 @@ public class MessageParameterObj { @Override public String toString() { - final StringBuilder b = new StringBuilder("Message("); + final StringBuilder b = new StringBuilder("MessageParameterObj("); b.append(key.name()); b.append(", "); b.append(Arrays.toString(args)); diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/ResourceBundleName.java b/cal10n-api/src/main/java/ch/qos/cal10n/ResourceBundleName.java index 7d730fa..4dc28b1 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/ResourceBundleName.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/ResourceBundleName.java @@ -52,7 +52,8 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; * * <p> * Verification tools such as {@link MessageKeyVerifier} can then proceed to - * check that the codes defined in the enum type match those in the resource bundles. + * check that the keys defined in the enum type match those in the corresponding + * resource bundles. * * @author Ceki Gülcü * diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java index b4ba6d8..db048f3 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/Cal10nError.java @@ -59,7 +59,7 @@ public class Cal10nError { return errorType; } - public String getCode() { + public String getKey() { return key; } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/ErrorFactory.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/ErrorFactory.java index 6445b2b..3a3476c 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/ErrorFactory.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/ErrorFactory.java @@ -44,8 +44,8 @@ public class ErrorFactory { this.resourceBundleName = resourceBundleName; } - Cal10nError buildError(ErrorType errorType, String code) { - return new Cal10nError(errorType, code, enumClass, locale, + Cal10nError buildError(ErrorType errorType, String key) { + return new Cal10nError(errorType, key, enumClass, locale, resourceBundleName); } } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java index 4effb60..48465e9 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/verifier/MessageKeyVerifier.java @@ -131,12 +131,6 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { return set; } - /* - * (non-Javadoc) - * - * @see ch.qos.cal10n.verifier.IIMessageCodeVerifier#typeIsolatedVerify(java. - * util.Locale) - */ public List<String> typeIsolatedVerify(Locale locale) { List<Cal10nError> errorList = verify(locale); List<String> strList = new ArrayList<String>(); @@ -168,11 +162,6 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { return errorList; } - /* - * (non-Javadoc) - * - * @see ch.qos.cal10n.verifier.IIMessageCodeVerifier#getLocaleNames() - */ public String[] getLocaleNames() { String[] localeNameArray = AnnotationExtractor.getLocaleNames(enumType); return localeNameArray; diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageCodeVerifierTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java similarity index 85% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageCodeVerifierTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java index e0354a6..c0d67c5 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageCodeVerifierTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java @@ -37,7 +37,7 @@ import ch.qos.cal10n.verifier.MessageKeyVerifier; * * @author Ceki Gülcü */ -public class MessageCodeVerifierTest { +public class MessageKeyVerifierTest { @Test @@ -52,8 +52,8 @@ public class MessageCodeVerifierTest { IMessageKeyVerifier miv = new MessageKeyVerifier(Countries.class); List<Cal10nError> errorList = miv.verify(Locale.UK); assertEquals(2, errorList.size()); - assertEquals("CH", errorList.get(0).getCode()); - assertEquals("BR", errorList.get(1).getCode()); + assertEquals("CH", errorList.get(0).getKey()); + assertEquals("BR", errorList.get(1).getKey()); } @@ -62,8 +62,8 @@ public class MessageCodeVerifierTest { IMessageKeyVerifier miv = new MessageKeyVerifier(Countries.class); List<Cal10nError> errorList = miv.verify(Locale.FRANCE); assertEquals(3, errorList.size()); - assertEquals("CH", errorList.get(0).getCode()); - assertEquals("CN", errorList.get(1).getCode()); - assertEquals("BR", errorList.get(2).getCode()); + assertEquals("CH", errorList.get(0).getKey()); + assertEquals("CN", errorList.get(1).getKey()); + assertEquals("BR", errorList.get(2).getKey()); } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java index 206b651..ba875ed 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java @@ -27,6 +27,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { MessageCodeVerifierTest.class, MessageConveyorTest.class }) +@SuiteClasses( { MessageKeyVerifierTest.class, MessageConveyorTest.class }) public class PackageTest { } diff --git a/cal10n-site/src/site/pages/codes.html b/cal10n-site/src/site/pages/codes.html new file mode 100644 index 0000000..876ed88 --- /dev/null +++ b/cal10n-site/src/site/pages/codes.html @@ -0,0 +1,70 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title>Error codes</title> + <link rel="stylesheet" type="text/css" href="css/common.css" /> + <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> + + </head> + <body> + <script type="text/javascript">prefix='';</script> + <script src="templates/header.js" type="text/javascript"></script> + <div id="left"> + <noscript>Please turn on Javascript to view this menu</noscript> + <script src="templates/left.js" type="text/javascript"></script> + </div> + <div id="content"> + + + <h1>CAL10N error codes and their meanings</h1> + + + <h3><a name="missingRBAnnotation" + href="#missingRBAnnotation">Missing + <code>@ResourceBundleName</code> annotation in enum type [...]. + </a> + </h3> + + <p>The @ResourceBundleName annotation is mandatory when an + enum type is used in conjuction with <a + href="apidocs/ch/qos/cal10n/MessageConveyor.html">MessageConveyor</a> + to retreive localized messages. See the <a + href="manual.html#core">user manual</a> as well as the javadocs + for <a + href="apidocs/ch/qos/cal10n/ResourceBundleName.html">ResourceBundleName</a> + annotation for more details. + </p> + + <hr/> + + <h3><a name="missingEnumType" href="#missingEnumType">Missing + <code><enumTypes></code> element.</a> + </h3> + + <p>The <code><enumTypes></code> is a required parameter of the + <em>maven-cal10n-plugin</em>. Please refer to the section on <a + href="manual.html#mavenPlugin"><em>maven-cal10n-plugin</em></a> in + the user manual for more details. + </p> + + + <hr/> + + <h3><a name="missingLocale" href="#missingLocale">Missing + @LocaleNames annotation in enum type [...].</a> + </h3> + + <p>If an enum type and its associated bundles are to be verified + via the <em>maven-cal10n-plugin</em>, then the enum type needs to + be annotated with <a + href="apidocs/ch/qos/cal10n/LocaleNames.html">LocaleNames</a>. + </p> + + <script src="templates/footer.js" type="text/javascript"></script> +</div> +</body> +</html> diff --git a/cal10n-site/src/site/pages/css/screen.css b/cal10n-site/src/site/pages/css/screen.css index 65d6987..bea6eeb 100644 --- a/cal10n-site/src/site/pages/css/screen.css +++ b/cal10n-site/src/site/pages/css/screen.css @@ -34,16 +34,21 @@ p.menu { #left { position: absolute; left: 0px; - width: 15em; - color: #564b47; + width: 15em; margin: 4px 0px 0px 4px; padding: 0px; + font-size: 80%; + background-color: #ffffff; +} + +.menuGroup { border: 1px solid #cccccc; background-color: #ffffff; - font-size: 80%; + color: #564b47; + border: 1px solid #cccccc; } -#left a, #right a { +.menuGroup a { display: block; width: 95.5%; margin: 0px; @@ -53,6 +58,16 @@ p.menu { text-decoration: none; } +.menuGroup a:hover { + border: solid 1px #FFFFFF; + background-color: #3333CC; + color: #ffffff; +} + +.pub { + text-align: center; +} + p.menu_header { margin: 0px; padding: 2px; @@ -62,21 +77,6 @@ p.menu_header { border-bottom: solid 1px #CCCCCC; } -#left img { - display: block; - margin: 20px 0 20px 17px; - border: none; -} - -#left a:hover, #right a:hover { - border: solid 1px #FFFFFF; - background-color: #3333CC; - color: #ffffff; -} - -#left a:hover.x { - background-color: #fff; -} #right { position: absolute; diff --git a/cal10n-site/src/site/pages/documentation.html b/cal10n-site/src/site/pages/documentation.html index d1386ea..0d6dde7 100644 --- a/cal10n-site/src/site/pages/documentation.html +++ b/cal10n-site/src/site/pages/documentation.html @@ -27,6 +27,7 @@ <ul> <li><a href="manual.html"><b>The CAL10N manual</b></a></li> + <li><a href="codes.html">Error codes and their meanings</a></li> </ul> <p>Source code related documentation:</p> diff --git a/cal10n-site/src/site/pages/index.html b/cal10n-site/src/site/pages/index.html index a1fbe85..0d1c527 100644 --- a/cal10n-site/src/site/pages/index.html +++ b/cal10n-site/src/site/pages/index.html @@ -17,6 +17,7 @@ <noscript>Please turn on Javascript to view this menu</noscript> <script src="templates/left.js" type="text/javascript"></script> </div> + <div id="content"> diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index 9d62b09..487ea8a 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -76,7 +76,7 @@ </p> - <h3>Core idea</h3> + <h2><a name="code" href="#core">Core idea</a></h2> <p>Instead of using values of type String as the key for each message, CAL10N uses <code>enums</code>.</p> @@ -126,12 +126,14 @@ RED=les roses sont rouges GREEN=les {0} sont verts</pre> - <h2>Retrieving internationalized messages</h2> + <h2><a name="retrieving" href="#retrieving">Retrieving + internationalized messages</a></h2> <p>In your application, you would retrieve the localized message via an <a href="apidocs/ch/qos/cal10n/IMessageConveyor.html">IMessageConveyor</a> - instance. </p> + instance. + </p> <pre class="prettyprint source">// obtain a message conveyor for France IMessageConveyor mc = new MessageConveyor(Locale.FRANCE); @@ -150,7 +152,33 @@ String blue = mc.getMessage(Colors.BLUE); </pre> comes with additional tooling support. </p> - <h2>Verification as a test case</h2> + + <h2><a name="deferred" href="#deferred">Deferred localization</a></h2> + + <p>Under certain circumstances, the appropriate locale is + <em>unknown</em> at the time or place where the message key and + message args are emitted. For example, a low level library might + wish to emit a localized message but it is only at the UI (user + interface) layer that the locale is known. As another example, + imagine that the host where the localized messages are presented to + the user is in a different locale, e.g. Japan, than the locale of + the source host. e.g. US. + </p> + + <p>The <a + href="xref/ch/qos/cal10n/MessageParameterObj.html">MessageParameterObj</a> + class is intended to support this particular use case. It allows you + to bundle the message key (an enum) plus any message + arguments. At a later time, when the locale is known, you would + invoke the <a + href="apidocs/ch/qos/cal10n/IMessageConveyor.html#getMessage(ch.qos.cal10n.MessageParameterObj)">getMessage(MessageParameterObj)</a> + method in <code>IMessageConveyor</code> to obtain the localized + message. + </p> + + + <h2><a name="verification" href="#verification">Verification as a + test case</a></h2> <p>A convenient and low hassle method for checking for mismatches between a given enum type and the corresponding resource bundles is @@ -255,7 +283,7 @@ public class MyAllInOneColorVerificationTest { } </pre> - <h2>Maven Plugin</h2> + <h2><a name="mavenPlugin" href="#mavenPlugin">Maven Plugin</a></h2> <p>The CAL10N project ships with a maven plugin designed to verify that the keys specified in a given enum type match those found in @@ -313,7 +341,7 @@ public class MyAllInOneColorVerificationTest { annotation. </p> - <h2>Eclipse plug-in</h2> + <h2><a name="eclipsePlugin" href="#eclipsePlugin">Eclipse plug-in</a></h2> <p>We are looking for volunteers willing to implement IDE support for CAL10N. Below is a litst of possible features of this IDE which @@ -349,7 +377,7 @@ public class MyAllInOneColorVerificationTest { <p>If interested please contact the cal10n-dev mailing list.</p> - <h2>Ant task</h2> + <h2><a name="antTask" href="#antTask">Ant task</a></h2> <p>We are looking for volunteers to implement an Ant task to verify resource bundles. The Ant task could be modeled after the diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index dac2e1d..0a65770 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -33,9 +33,16 @@ <h3>1st of September 2009 - Release of CAL10N version 0.5.1</h3> <p>Fixed a bug causing the <em>maven-cal10n-plugin</em> to fail on - Linux. The plug-in is not tested on both Windows and Linux. + Linux. The plug-in is now tested on both Windows and Linux to work + as expected. </p> + <p>Added support for <a href="manual.html#deferred">deferred + localization</a>.</p> + + <p>Added page on CAL10N <a href="codes.html">error codes</a> and + their meanings.</p> + <hr width="80%" align="center" /> diff --git a/cal10n-site/src/site/pages/templates/left.js b/cal10n-site/src/site/pages/templates/left.js index ab10619..85428dc 100644 --- a/cal10n-site/src/site/pages/templates/left.js +++ b/cal10n-site/src/site/pages/templates/left.js @@ -1,19 +1,18 @@ -document.write('<p class="menu_header">CAL10N project</p>'); -document.write('<p class="menu"><a href="' + prefix + 'index.html">Introduction</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'download.html">Download</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'documentation.html">Documentation</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'mailinglist.html">Mailing Lists</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'repos.html">Source Repository</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'bugreport.html">Bug Report</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); - - -// document.write('<p>Sponsored by:'); -// document.write('<a href="http://www.qos.ch/"><img src="' + prefix + 'images/qoslogo.gif" border="1"/></a></p>'); - - - - - +document.write('<div class="menuGroup">'); +document.write(' <p class="menu_header">CAL10N project</p>'); +document.write(' <p class="menu"><a href="' + prefix + 'index.html">Introduction</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'download.html">Download</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'documentation.html">Documentation</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'mailinglist.html">Mailing Lists</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'repos.html">Source Repository</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'bugreport.html">Bug Report</a></p>'); +document.write(' <p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); +document.write('</div>'); + +document.write('<p class="pub">'); +document.write(' <a href="https://www.qos.ch/shop/products/log4j/log4j-Manual.jsp">'); +document.write(' <img src="images/buyDirect.jpg" border="0" title="" alt="buy direct from the developer"/>'); +document.write(' </a>'); +document.write('</p>'); \ No newline at end of file diff --git a/cal10n-site/src/site/resources/images/buyDirect.jpg b/cal10n-site/src/site/resources/images/buyDirect.jpg new file mode 100644 index 0000000..dd2ff4c Binary files /dev/null and b/cal10n-site/src/site/resources/images/buyDirect.jpg differ diff --git a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java index d5d804b..72d7c83 100644 --- a/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java +++ b/maven-cal10n-plugin/src/main/java/ch/qos/cal10n/plugins/VerifyMojo.java @@ -92,7 +92,7 @@ public class VerifyMojo extends AbstractMojo { + MISSING_ENUM_TYPES); } for (String enumTypeAsStr : enumTypes) { - IMessageKeyVerifier imcv = getMessageCodeVerifierInstance(enumTypeAsStr); + IMessageKeyVerifier imcv = getMessageKeyVerifierInstance(enumTypeAsStr); getLog() .info( "Checking all resource bundles for enum type [" + enumTypeAsStr @@ -110,7 +110,7 @@ public class VerifyMojo extends AbstractMojo { if (localeNameArray == null || localeNameArray.length == 0) { String errMsg = "Missing @LocaleNames annotation in enum type [" - + enumClassAsStr + "]"; + + enumClassAsStr + "]. Please see "+MISSING_LOCALE; getLog().error(errMsg); throw new MojoFailureException(errMsg); } @@ -136,13 +136,13 @@ public class VerifyMojo extends AbstractMojo { } if (failure) { throw new MojoFailureException("FAIL Verification of [" + enumClassAsStr - + "] codes."); + + "] keys."); } } - IMessageKeyVerifier getMessageCodeVerifierInstance(String enumClassAsStr) + IMessageKeyVerifier getMessageKeyVerifierInstance(String enumClassAsStr) throws MojoExecutionException { - String errMsg = "Failed to instantiate MessageCodeVerifier class"; + String errMsg = "Failed to instantiate MessageKeyVerifier class"; try { ThisFirstClassLoader thisFirstClassLoader = (ThisFirstClassLoader) buildClassLoader(); Class<?> mkvClass = Class.forName(Cal10nConstants.MessageKeyVerifier_FQCN, ----------------------------------------------------------------------- Summary of changes: .../main/java/ch/qos/cal10n/IMessageConveyor.java | 16 +++-- .../src/main/java/ch/qos/cal10n/LocaleNames.java | 10 ++-- .../main/java/ch/qos/cal10n/MessageConveyor.java | 2 +- .../java/ch/qos/cal10n/MessageParameterObj.java | 16 ++-- .../java/ch/qos/cal10n/ResourceBundleName.java | 3 +- .../java/ch/qos/cal10n/verifier/Cal10nError.java | 2 +- .../java/ch/qos/cal10n/verifier/ErrorFactory.java | 4 +- .../ch/qos/cal10n/verifier/MessageKeyVerifier.java | 11 --- ...rifierTest.java => MessageKeyVerifierTest.java} | 12 ++-- .../java/ch/qos/cal10n/sample/PackageTest.java | 2 +- cal10n-site/src/site/pages/codes.html | 70 ++++++++++++++++++++ cal10n-site/src/site/pages/css/screen.css | 38 +++++----- cal10n-site/src/site/pages/documentation.html | 1 + cal10n-site/src/site/pages/index.html | 1 + cal10n-site/src/site/pages/manual.html | 42 ++++++++++-- cal10n-site/src/site/pages/news.html | 9 ++- cal10n-site/src/site/pages/templates/left.js | 35 +++++----- .../src/site/resources/images/buyDirect.jpg | Bin 0 -> 24142 bytes .../java/ch/qos/cal10n/plugins/VerifyMojo.java | 10 ++-- 19 files changed, 192 insertions(+), 92 deletions(-) rename cal10n-api/src/test/java/ch/qos/cal10n/sample/{MessageCodeVerifierTest.java => MessageKeyVerifierTest.java} (85%) create mode 100644 cal10n-site/src/site/pages/codes.html create mode 100644 cal10n-site/src/site/resources/images/buyDirect.jpg hooks/post-receive -- Compiler assisted localization library