October 2009 - cal10n-dev - mailman3.qos.ch

[JIRA] Created: (CAL-8) MessageConveyer.lookup() uses wrong classloader
by Pete Muir (JIRA) 25 Aug '10

25 Aug '10

MessageConveyer.lookup() uses wrong classloader ----------------------------------------------- Key: CAL-8 URL: http://jira.qos.ch/browse/CAL-8 Project: CAL10N Issue Type: Bug Environment: cal10n 0.7 Reporter: Pete Muir Assignee: Ceki Gulcu MessageConveyer uses this.getClass().getClassLoader() as the classloader to use to search for resource bundles. If you wish to install cal10n as a installed library in an application server (or in any case where the cal10n jar is placed on a parent classlaoder), the classloader of the classes using cal10n may not be searched for resource bundles. I would suggest using declaredClass.getClassLoader(). -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

3 3

[JIRA] Created: (CAL-9) Add OSGi bundle headers to cal10n-api
by Pete Muir (JIRA) 06 Jan '10

06 Jan '10

Add OSGi bundle headers to cal10n-api ------------------------------------- Key: CAL-9 URL: http://jira.qos.ch/browse/CAL-9 Project: CAL10N Issue Type: New Feature Reporter: Pete Muir Assignee: Ceki Gulcu cal10n-api should export (at least) the ch.qos.cal10n package -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

3 3

Ant-Task
by zeeman 14 Nov '09

14 Nov '09

Hi there! I discovered this project via sl4j. I like the idea and integrated cal10n in my project. I've also written a small Ant task as requested by http://cal10n.qos.ch/manual.html#antTask. Where can I submit it for a review? It is like the maven-plugin (I guess): > <taskdef name="verifyTask" > classname="ch.qos.cal10n.plugins.ant.VerifyTask" /> > > <verifyTask> > <enumTypes> > <enumType>com.foo.somePackage.Colors</enumType> > <enumType>com.foo.otherPackage.Foods</enumType> > </enumTypes> > </verifyTask> and uses the MessageKeyVerifier as described in http://cal10n.qos.ch/manual.html#singleTest Best regards, Sebastian -- PGP Schlüssel-ID: 0x3C6D2D61 Fingerabdruck: 75F4 C819 D611 5C02 BA8A 7A77 E9E0 8211 3C6D 2D61

2 4

[JIRA] Created: (CAL-3) Add ability to support multiple IMessageConveyor implementations.
by Ralph Goers (JIRA) 03 Nov '09

03 Nov '09

Add ability to support multiple IMessageConveyor implementations. ----------------------------------------------------------------- Key: CAL-3 URL: http://jira.qos.ch/browse/CAL-3 Project: CAL10N Issue Type: New Feature Reporter: Ralph Goers Assignee: Ceki Gulcu I would like to provide an implementation that uses Apache Commons Configuration to manage the actual data. To do that a mechanism to specify the implementation must be provided. Some possibilities 1) A simple factory 2) requiring the implementation be provided in a separate jar. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 1

Release of CAL10N 0.7.2
by Ceki Gulcu 29 Oct '09

29 Oct '09

29th of October 2009 - Release of CAL10N 0.7.2 I am happy to announce the immediate availability of CAL10N version 0.7.2. This release adds OSGi manifest information in cal10n artifacts. Please refer to the the news page for precise details. http://cal10n.qos.ch/news.html You can download cal10n, including full source code, class files and documentation on our download page, shown below. http://cal10n.qos.ch/download.html You can receive cal10n related announcements by subscribing to the qos.ch announce mailing list. To subscribe to qos.ch announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/announce Best regards, -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

1 0

annotated tag, v0.7.2, created. v0.7.2
by git-noreply＠pixie.qos.ch 29 Oct '09

29 Oct '09

The annotated tag, v0.7.2 has been created at 9a02907b5986f344b56f90646ca1e89bc500f38b (tag) tagging ff91eb1c05510d41e19243a039a85f4864af0648 (commit) replaces v0.7 tagged by Ceki Gulcu on Thu Oct 29 19:32:19 2009 +0100 - Log ----------------------------------------------------------------- tagging as 0.7.2 Ceki Gulcu (7): text about colors being an example started wirk on 0.7.1 more editing - added doc on parameter substitution. This fixes http://jira.qos.ch/browse/CAL-7 cal10n-announce replaced by announce(a)qos.ch - Fixed CAL-9 by adding OSGI headers to cal10n-api MANIFEST file - The bundle <code>lookup</code>() method in MessageConveyor now uses ----------------------------------------------------------------------- hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.7-7-gff91eb1
by git-noreply＠pixie.qos.ch 28 Oct '09

28 Oct '09

The branch, master has been updated via ff91eb1c05510d41e19243a039a85f4864af0648 (commit) from c835e6c2babc39cd5c935b00a84d7d4bc796cce0 (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=ff91eb1c05510d41e19243a03… http://github.com/ceki/cal10n/commit/ff91eb1c05510d41e19243a039a85f4864af06… commit ff91eb1c05510d41e19243a039a85f4864af0648 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 28 18:25:09 2009 +0100 - The bundle <code>lookup</code>() method in MessageConveyor now uses the class loader of the enum tpye instead of the class loader which loaded the MessageConveyor class. The fixes CAL-8. 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 11395c9..ff9033e 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java @@ -42,86 +42,90 @@ import ch.qos.cal10n.util.CAL10NResourceBundleFinder; */ public class MessageConveyor implements IMessageConveyor { - final Locale locale; - - final Map<String, CAL10NResourceBundle> cache = new ConcurrentHashMap<String, CAL10NResourceBundle>(); - - /** - * The {@link Locale} associated with this instance. - * - * @param locale - */ - public MessageConveyor(Locale locale) { - this.locale = locale; - } - - /** - * Given an enum as key, find the corresponding resource bundle and return the - * corresponding internationalized. - * - * <p> - * The name of the resource bundle is defined via the {@link BaseName} - * annotation whereas the locale is specified in this MessageConveyor - * instance's constructor. - * - * @param key - * an enum instance used as message key - * - */ - public <E extends Enum<?>> String getMessage(E key, Object... args) - throws MessageConveyorException { - - String declararingClassName = key.getDeclaringClass().getName(); - CAL10NResourceBundle rb = cache.get(declararingClassName); - if (rb == null || rb.hasChanged()) { - rb = lookup(key); - cache.put(declararingClassName, rb); - } - - String keyAsStr = key.toString(); - String value = rb.getString(keyAsStr); - if (value == null) { - return "No key found for " + keyAsStr; - } else { - if (args == null || args.length == 0) { - return value; - } else { - return MessageFormat.format(value, args); - } - } - } - - private <E extends Enum<?>> CAL10NResourceBundle lookup(E key) - throws MessageConveyorException { - Class<?> declaringClass = key.getDeclaringClass(); - - String baseName = AnnotationExtractor.getBaseName(key.getDeclaringClass()); - if (baseName == null) { - throw new MessageConveyorException( - "Missing @BaseName annotation in enum type [" - + key.getClass().getName() + "]. See also " - + Cal10nConstants.MISSING_BN_ANNOTATION_URL); - } - - String charset = AnnotationExtractor.getCharset(declaringClass, locale); - CAL10NResourceBundle rb = CAL10NResourceBundleFinder.getBundle(this - .getClass().getClassLoader(), baseName, locale, charset); - - if (rb == null) { - throw new MessageConveyorException("Failed to locate resource bundle [" - + baseName + "] for locale [" + locale + "] for enum type [" - + key.getDeclaringClass().getName() + "]"); - } - return rb; - } - - public String getMessage(MessageParameterObj mpo) - throws MessageConveyorException { - if (mpo == null) { - throw new IllegalArgumentException( - "MessageParameterObj argumument cannot be null"); - } - return getMessage(mpo.getKey(), mpo.getArgs()); - } - + final Locale locale; + + final Map<String, CAL10NResourceBundle> cache = new ConcurrentHashMap<String, CAL10NResourceBundle>(); + + /** + * The {@link Locale} associated with this instance. + * + * @param locale + */ + public MessageConveyor(Locale locale) { + this.locale = locale; + } + + /** + * Given an enum as key, find the corresponding resource bundle and return + * the corresponding internationalized. + * + * <p> + * The name of the resource bundle is defined via the {@link BaseName} + * annotation whereas the locale is specified in this MessageConveyor + * instance's constructor. + * + * @param key + * an enum instance used as message key + * + */ + public <E extends Enum<?>> String getMessage(E key, Object... args) + throws MessageConveyorException { + + String declararingClassName = key.getDeclaringClass().getName(); + CAL10NResourceBundle rb = cache.get(declararingClassName); + if (rb == null || rb.hasChanged()) { + rb = lookup(key); + cache.put(declararingClassName, rb); + } + + String keyAsStr = key.toString(); + String value = rb.getString(keyAsStr); + if (value == null) { + return "No key found for " + keyAsStr; + } else { + if (args == null || args.length == 0) { + return value; + } else { + return MessageFormat.format(value, args); + } + } + } + + private <E extends Enum<?>> CAL10NResourceBundle lookup(E key) + throws MessageConveyorException { + Class<?> declaringClass = key.getDeclaringClass(); + + String baseName = AnnotationExtractor.getBaseName(key + .getDeclaringClass()); + if (baseName == null) { + throw new MessageConveyorException( + "Missing @BaseName annotation in enum type [" + + key.getClass().getName() + "]. See also " + + Cal10nConstants.MISSING_BN_ANNOTATION_URL); + } + + String charset = AnnotationExtractor.getCharset(declaringClass, locale); + // use the declaring class' loader instead of + // this.getClass().getClassLoader() + // see also http://jira.qos.ch/browse/CAL-8 + CAL10NResourceBundle rb = CAL10NResourceBundleFinder.getBundle( + declaringClass.getClassLoader(), baseName, locale, charset); + + if (rb == null) { + throw new MessageConveyorException( + "Failed to locate resource bundle [" + baseName + + "] for locale [" + locale + "] for enum type [" + + key.getDeclaringClass().getName() + "]"); + } + return rb; + } + + public String getMessage(MessageParameterObj mpo) + throws MessageConveyorException { + if (mpo == null) { + throw new IllegalArgumentException( + "MessageParameterObj argumument cannot be null"); + } + return getMessage(mpo.getKey(), mpo.getArgs()); + } } diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index 4dbfedb..53397c1 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -34,6 +34,14 @@ Muir in <a href="http://jira.qos.ch/browse/CAL-9">CAL-9</a>. </p> + <p>The bundle <code>lookup</code>() method in + <code>MessageConveyor</code> now uses the class loader of the enum + tpye instead of the class loader which loaded the + <code>MessageConveyor</code> class. The fixes <a + href="http://jira.qos.ch/browse/CAL-8">CAL-8</a> as reported by + Pete Muir. + </p> + <hr width="80%" align="center" /> <h3>4th of September 2009 - Release of CAL10N version 0.7</h3> ----------------------------------------------------------------------- Summary of changes: .../main/java/ch/qos/cal10n/MessageConveyor.java | 168 ++++++++++---------- cal10n-site/src/site/pages/news.html | 8 + 2 files changed, 94 insertions(+), 82 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.7-6-gc835e6c
by git-noreply＠pixie.qos.ch 28 Oct '09

28 Oct '09

The branch, master has been updated via c835e6c2babc39cd5c935b00a84d7d4bc796cce0 (commit) from 257f4868ae545076338e9c18069c9e3aebf770d7 (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=c835e6c2babc39cd5c935b00a… http://github.com/ceki/cal10n/commit/c835e6c2babc39cd5c935b00a84d7d4bc796cc… commit c835e6c2babc39cd5c935b00a84d7d4bc796cce0 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 28 18:15:07 2009 +0100 - Fixed CAL-9 by adding OSGI headers to cal10n-api MANIFEST file - Bumped version number to 0.7.2 diff --git a/cal10n-api/pom.xml b/cal10n-api/pom.xml index 3a31ffe..1e66469 100644 --- a/cal10n-api/pom.xml +++ b/cal10n-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.2</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -16,4 +16,33 @@ <dependencies> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifestEntries> + <Bundle-Version>${project.version}</Bundle-Version> + <Bundle-Description>${project.description}</Bundle-Description> + <Implementation-Version>${project.version}</Implementation-Version> + </manifestEntries> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + <executions> + <execution> + <id>bundle-test-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file diff --git a/cal10n-api/src/main/resources/META-INF/MANIFEST.MF b/cal10n-api/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..ddc930d --- /dev/null +++ b/cal10n-api/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Implementation-Title: cal10n-api +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: cal10n.api +Bundle-Name: cal10n-api +Bundle-Vendor: qos.ch +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: ch.qos.cal10n;version=${project.version} \ No newline at end of file diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java index f135751..8c43211 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java @@ -106,7 +106,6 @@ public class MessageConveyorTest { } } - @Test public void minimal() { MessageConveyor mc = new MessageConveyor(Locale.ENGLISH); diff --git a/cal10n-site/pom.xml b/cal10n-site/pom.xml index a52bcb7..031679c 100644 --- a/cal10n-site/pom.xml +++ b/cal10n-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index 7752a87..4dbfedb 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -26,6 +26,13 @@ the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch announce</a> mailing list. </p> + <hr width="80%" align="center" /> + + <h3>28th of October 2009 - Release of CAL10N version 0.7.2</h3> + + <p>Added OSGi bundle headers to cal10n-api as requested by Peter + Muir in <a href="http://jira.qos.ch/browse/CAL-9">CAL-9</a>. + </p> <hr width="80%" align="center" /> diff --git a/maven-cal10n-plugin-smoke/pom.xml b/maven-cal10n-plugin-smoke/pom.xml index 8d6f4ab..8321dcf 100644 --- a/maven-cal10n-plugin-smoke/pom.xml +++ b/maven-cal10n-plugin-smoke/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/maven-cal10n-plugin/pom.xml b/maven-cal10n-plugin/pom.xml index 3e85799..7d9494a 100644 --- a/maven-cal10n-plugin/pom.xml +++ b/maven-cal10n-plugin/pom.xml @@ -8,7 +8,7 @@ <parent> <artifactId>cal10n-parent</artifactId> <groupId>ch.qos.cal10n</groupId> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.2</version> </parent> <groupId>ch.qos.cal10n.plugins</groupId> diff --git a/pom.xml b/pom.xml index 76950b6..958884a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.cal10n</groupId> <artifactId>cal10n-parent</artifactId> <packaging>pom</packaging> - <version>0.7.1-SNAPSHOT</version> + <version>0.7.2</version> <name>Compiler assisted localization library (CAL10N) - Parent</name> <url>http://cal10n.qos.ch</url> ----------------------------------------------------------------------- Summary of changes: cal10n-api/pom.xml | 31 +++++++++++++++++++- cal10n-api/src/main/resources/META-INF/MANIFEST.MF | 7 ++++ .../java/ch/qos/cal10n/MessageConveyorTest.java | 1 - cal10n-site/pom.xml | 2 +- cal10n-site/src/site/pages/news.html | 7 ++++ maven-cal10n-plugin-smoke/pom.xml | 2 +- maven-cal10n-plugin/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 cal10n-api/src/main/resources/META-INF/MANIFEST.MF hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.7-5-g257f486
by git-noreply＠pixie.qos.ch 16 Oct '09

16 Oct '09

The branch, master has been updated via 257f4868ae545076338e9c18069c9e3aebf770d7 (commit) from dadab94765a9b1d1ff7d26857d1526ce1399b12b (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=257f4868ae545076338e9c180… http://github.com/ceki/cal10n/commit/257f4868ae545076338e9c18069c9e3aebf770… commit 257f4868ae545076338e9c18069c9e3aebf770d7 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 16 21:03:02 2009 +0200 cal10n-announce replaced by announce(a)qos.ch diff --git a/cal10n-site/src/site/pages/mailinglist.html b/cal10n-site/src/site/pages/mailinglist.html index deaf4ea..4d098be 100644 --- a/cal10n-site/src/site/pages/mailinglist.html +++ b/cal10n-site/src/site/pages/mailinglist.html @@ -62,23 +62,23 @@ <th>Archives</th> </tr> <tr class="b"> - <td>Cal10n Announce List</td> + <td>QOS.ch announce List</td> <td>Low</td> <td> <a - href="http://qos.ch/mailman/listinfo/cal10n-announce"> + href="http://qos.ch/mailman/listinfo/announce"> Subscribe </a> </td> <td> <a - href="http://qos.ch/mailman/options/cal10n-announce"> + href="http://qos.ch/mailman/options/announce"> Unsubscribe </a> </td> <td> <a - href="http://www.qos.ch/pipermail/cal10n-announce/"> + href="http://www.qos.ch/pipermail/announce/"> pipermail </a> <!--| diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index 38c6e9a..7752a87 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -23,9 +23,8 @@ <h2>CAL10N News</h2> <p>You can receive cal10n-related announcements by subscribing to - the <a - href="http://www.qos.ch/mailman/listinfo/cal10n-announce">cal10n-announce</a> - mailing list. </p> + the <a href="http://www.qos.ch/mailman/listinfo/announce">QOS.ch + announce</a> mailing list. </p> <hr width="80%" align="center" /> ----------------------------------------------------------------------- Summary of changes: cal10n-site/src/site/pages/mailinglist.html | 8 ++++---- cal10n-site/src/site/pages/news.html | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0