- cal10n-dev - mailman3.qos.ch

[JIRA] Created: (CAL-4) support for bundle reloading
by Ceki Gulcu (JIRA) 03 Sep '09

03 Sep '09

support for bundle reloading ---------------------------- Key: CAL-4 URL: http://jira.qos.ch/browse/CAL-4 Project: CAL10N Issue Type: New Feature Reporter: Ceki Gulcu Assignee: Ceki Gulcu such support should be synchronized with any caching mechanism introduced in MessageConveyor -- 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

1 1

[JIRA] Created: (CAL-2) Check the performance of MessageConvetory.getMessage
by Ceki Gulcu (JIRA) 03 Sep '09

03 Sep '09

Check the performance of MessageConvetory.getMessage ---------------------------------------------------- Key: CAL-2 URL: http://jira.qos.ch/browse/CAL-2 Project: CAL10N Issue Type: Task Reporter: Ceki Gulcu Assignee: Ceki Gulcu Check whether MessageConvetory.getMessage() has reasonable performance. -- 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

1 1

branch, master, updated. v0.6-5-ga264da1
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via a264da16ea50b785c2dd97eef9362a903ef1aaa8 (commit) from 0d7abd22d429a86bf88f05ee5e04248df1d701d5 (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=a264da16ea50b785c2dd97eef… http://github.com/ceki/cal10n/commit/a264da16ea50b785c2dd97eef9362a903ef1aa… commit a264da16ea50b785c2dd97eef9362a903ef1aaa8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 23:14:01 2009 +0200 - editing diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index 913bb20..fa8f93b 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -146,12 +146,16 @@ String blue = mc.getMessage(Colors.BLUE); </pre> have been accustomed to, but adds compiler verification on top.</p> - <p>An astute reader will comment that even if the messages keys are now - verified by the compiler, it is still possible to have mismatching - message keys in the resources bundles. For this reason, CAL10N - comes with additional tooling support. + <p>An astute reader will comment that even if the messages keys are + now verified by the compiler, it is still possible to have + mismatching message keys in the resources bundles. For this reason, + CAL10N comes with additional tools, including <a + href="#verification" class="big greenBold" >support for writing Junit test cases</a> and a + <a href="#mavenPlugin">maven plugin</a>. </p> + + <h2><a name="simplifiedLookup" href="#simplifiedLookup">Simplified bundle look-up procedure</a></h2> @@ -199,6 +203,19 @@ colors_fr_FR.properties</pre> href="http://en.wikipedia.org/wiki/Principle_of_least_astonishment"> less surprise</a>.</p> + <h2><a name="reload" href="#reload">Automatic reloading of resource + bundles upon change</a></h2> + + <p>When a resource bundle for a given locale is changed on the file + system, <code>MessageConveyor</code> will automatically reload the + resource bundle. It may take at most 10 minutes for the change to be + detected.</p> + + <p>Automatic reloading applies if the resource bundle is a regular + file but not if nested within a jar file. + </p> + + <h2><a name="deferred" href="#deferred">Deferred localization</a></h2> @@ -223,7 +240,6 @@ colors_fr_FR.properties</pre> message. </p> - <h2><a name="verification" href="#verification">Verification as a test case</a></h2> @@ -330,6 +346,7 @@ public class MyAllInOneColorVerificationTest { } </pre> + <h2><a name="mavenPlugin" href="#mavenPlugin">Maven Plugin</a></h2> <p>The CAL10N project ships with a maven plugin designed to verify ----------------------------------------------------------------------- Summary of changes: cal10n-site/src/site/pages/manual.html | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6-4-g0d7abd2
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via 0d7abd22d429a86bf88f05ee5e04248df1d701d5 (commit) from 6dbd2687823a3cca73dc0427d31ce82b5a217b97 (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=0d7abd22d429a86bf88f05ee5… http://github.com/ceki/cal10n/commit/0d7abd22d429a86bf88f05ee5e04248df1d701… commit 0d7abd22d429a86bf88f05ee5e04248df1d701d5 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 22:34:21 2009 +0200 - minor changes diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java index 8c6c818..978e507 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java @@ -22,8 +22,8 @@ package ch.qos.cal10n; -import static org.junit.Assert.*; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; @@ -40,8 +40,6 @@ import ch.qos.cal10n.util.MiscUtil; public class MessageConveyorReloadTest { - - @Test public void bundleReload() throws IOException, InterruptedException { ClassLoader classLoader = this.getClass().getClassLoader(); @@ -50,7 +48,6 @@ public class MessageConveyorReloadTest { assertNotNull("the problem is in this test, not the code tested", url); MessageConveyor mc = new MessageConveyor(new Locale("en")); - mc.getMessage(Colors.BLUE); CAL10NPropertyResourceBundle initalRB = mc.cache.get(Colors.BLUE.getDeclaringClass().getName()); 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 0f1c026..5726920 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java @@ -23,20 +23,14 @@ package ch.qos.cal10n; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URL; import java.util.Locale; import org.junit.Test; import ch.qos.cal10n.sample.Colors; import ch.qos.cal10n.sample.Host.OtherColors; -import ch.qos.cal10n.util.MiscUtil; public class MessageConveyorTest { @@ -111,15 +105,4 @@ public class MessageConveyorTest { } } - @Test - public void bundleReload() throws IOException { - ClassLoader classLoader = this.getClass().getClassLoader(); - String resourceCandidate = "colors" + "_" + "en" + ".properties"; - URL url = classLoader.getResource(resourceCandidate); - assertNotNull("the problem is in this test, not the code tested", url); - - File file = MiscUtil.urlToFile(url); - FileOutputStream fos = new FileOutputStream(file, true); - assertNotNull(file); - } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java index 739a19e..be736c8 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java @@ -27,6 +27,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { MessageConveyorTest.class }) +@SuiteClasses( { MessageConveyorTest.class, MessageConveyorReloadTest.class }) public class PackageTest { } ----------------------------------------------------------------------- Summary of changes: .../ch/qos/cal10n/MessageConveyorReloadTest.java | 5 +---- .../java/ch/qos/cal10n/MessageConveyorTest.java | 17 ----------------- .../src/test/java/ch/qos/cal10n/PackageTest.java | 2 +- 3 files changed, 2 insertions(+), 22 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6-3-g6dbd268
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via 6dbd2687823a3cca73dc0427d31ce82b5a217b97 (commit) from 78f0bec7c34006d8db9796952102cee3ea0fe9f5 (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=6dbd2687823a3cca73dc0427d… http://github.com/ceki/cal10n/commit/6dbd2687823a3cca73dc0427d31ce82b5a217b… commit 6dbd2687823a3cca73dc0427d31ce82b5a217b97 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 22:30:46 2009 +0200 - Reorganized various unit tests - testing reloading of resource file after change diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java index fec35be..45aecaf 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java @@ -47,7 +47,7 @@ public class CAL10NPropertyResourceBundle extends PropertyResourceBundle { } public boolean hasChanged() { - //if the host file is unknown, no point in a check + // if the host file is unknown, no point in a check if (hostFile == null) { return false; } @@ -65,4 +65,12 @@ public class CAL10NPropertyResourceBundle extends PropertyResourceBundle { } } } + + /** + * WARNING: Used for testing purposes. Do not invoke directly in user code. + */ + public void resetCheckTimes() { + nextCheck = 0; + lastModified = 0; + } } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/StringToLocale.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/MiscUtil.java similarity index 77% rename from cal10n-api/src/main/java/ch/qos/cal10n/util/StringToLocale.java rename to cal10n-api/src/main/java/ch/qos/cal10n/util/MiscUtil.java index 1e70cf8..6f5489d 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/StringToLocale.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/MiscUtil.java @@ -21,9 +21,11 @@ */ package ch.qos.cal10n.util; +import java.io.File; +import java.net.URL; import java.util.Locale; -public class StringToLocale { +public class MiscUtil { public static Locale toLocale(String localeName) { if (localeName == null) { @@ -36,4 +38,20 @@ public class StringToLocale { return new Locale(localeName); } } + + public static File urlToFile(URL url) { + if(url.getProtocol() != "file") { + return null; + } + String path = url.getPath(); + if(path == null) + return null; + File candidate = new File(path); + if(candidate.exists()) { + return candidate; + } else { + return null; + } + } + } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java index 6b102f4..9d4c094 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java @@ -21,7 +21,6 @@ */ package ch.qos.cal10n.util; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -70,7 +69,7 @@ public class PropertyResourceBundleFinder { if (url != null) { try { InputStream in = openConnectionForUrl(url); - prb = new CAL10NPropertyResourceBundle(in, urlToFile(url)); + prb = new CAL10NPropertyResourceBundle(in, MiscUtil.urlToFile(url)); in.close(); } catch (IOException e) { } @@ -78,21 +77,6 @@ public class PropertyResourceBundleFinder { return prb; } - static File urlToFile(URL url) { - if(url.getProtocol() != "file") { - return null; - } - String path = url.getPath(); - if(path == null) - return null; - File candidate = new File(path); - if(candidate.exists()) { - return candidate; - } else { - return null; - } - } - private static String computeLanguageAndCountryCandidate(String baseName, Locale locale) { String language = locale.getLanguage(); 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 8b78912..c72e09d 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 @@ -32,7 +32,7 @@ import java.util.Set; import ch.qos.cal10n.util.AnnotationExtractor; import ch.qos.cal10n.util.PropertyResourceBundleFinder; -import ch.qos.cal10n.util.StringToLocale; +import ch.qos.cal10n.util.MiscUtil; import ch.qos.cal10n.verifier.Cal10nError.ErrorType; /** @@ -157,7 +157,7 @@ public class MessageKeyVerifier implements IMessageKeyVerifier { throw new IllegalStateException(errMsg); } for (String localeName : localeNameArray) { - Locale locale = StringToLocale.toLocale(localeName); + Locale locale = MiscUtil.toLocale(localeName); System.out.println(locale); List<Cal10nError> tmpList = verify(locale); errorList.addAll(tmpList); diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/AllCal10nTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/AllCal10nTest.java index 4a9a34e..bd250d5 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/AllCal10nTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/AllCal10nTest.java @@ -25,10 +25,11 @@ package ch.qos.cal10n; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; - + @RunWith(Suite.class) -(a)SuiteClasses({ch.qos.cal10n.util.PackageTest.class, - ch.qos.cal10n.sample.PackageTest.class}) +@SuiteClasses( { ch.qos.cal10n.PackageTest.class, + ch.qos.cal10n.util.PackageTest.class, + ch.qos.cal10n.verifier.PackageTest.class }) public class AllCal10nTest { } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorPerftest.java similarity index 91% copy from cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java copy to cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorPerftest.java index 537b798..163067c 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorPerftest.java @@ -19,15 +19,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n; import java.util.Locale; import org.junit.Ignore; import org.junit.Test; -import ch.qos.cal10n.IMessageConveyor; -import ch.qos.cal10n.MessageConveyor; +import ch.qos.cal10n.sample.Colors; // with caching ~300 nanos per translation // without caching 149'963 nanos or 149 micros per translation diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java new file mode 100644 index 0000000..8c6c818 --- /dev/null +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2009 QOS.ch All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package ch.qos.cal10n; + +import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.util.Locale; +import java.util.ResourceBundle; + +import org.junit.Test; + +import ch.qos.cal10n.sample.Colors; +import ch.qos.cal10n.util.CAL10NPropertyResourceBundle; +import ch.qos.cal10n.util.MiscUtil; + +public class MessageConveyorReloadTest { + + + + + @Test + public void bundleReload() throws IOException, InterruptedException { + ClassLoader classLoader = this.getClass().getClassLoader(); + String resourceCandidate = "colors" + "_" + "en" + ".properties"; + URL url = classLoader.getResource(resourceCandidate); + assertNotNull("the problem is in this test, not the code tested", url); + + MessageConveyor mc = new MessageConveyor(new Locale("en")); + + mc.getMessage(Colors.BLUE); + + CAL10NPropertyResourceBundle initalRB = mc.cache.get(Colors.BLUE.getDeclaringClass().getName()); + initalRB.resetCheckTimes(); + File file = MiscUtil.urlToFile(url); + file.setLastModified(System.currentTimeMillis()+60*60*1000); + mc.getMessage(Colors.BLUE); + ResourceBundle other = mc.cache.get(Colors.BLUE.getDeclaringClass().getName()); + assertTrue(initalRB != other); + } +} diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java similarity index 79% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java index 6d8e987..0f1c026 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorTest.java @@ -20,19 +20,23 @@ * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; import java.util.Locale; import org.junit.Test; -import ch.qos.cal10n.MessageConveyor; -import ch.qos.cal10n.MessageConveyorException; -import ch.qos.cal10n.MessageParameterObj; +import ch.qos.cal10n.sample.Colors; import ch.qos.cal10n.sample.Host.OtherColors; +import ch.qos.cal10n.util.MiscUtil; public class MessageConveyorTest { @@ -106,4 +110,16 @@ public class MessageConveyorTest { e.getMessage()); } } + + @Test + public void bundleReload() throws IOException { + ClassLoader classLoader = this.getClass().getClassLoader(); + String resourceCandidate = "colors" + "_" + "en" + ".properties"; + URL url = classLoader.getResource(resourceCandidate); + assertNotNull("the problem is in this test, not the code tested", url); + + File file = MiscUtil.urlToFile(url); + FileOutputStream fos = new FileOutputStream(file, true); + assertNotNull(file); + } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java similarity index 85% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java index ca1f4e2..739a19e 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/PackageTest.java @@ -20,14 +20,13 @@ * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { MessageKeyVerifierTest.class, MessageConveyorTest.class, - MyColorVerificationTest.class, MyAllInOneColorVerificationTest.class }) +@SuiteClasses( { MessageConveyorTest.class }) public class PackageTest { } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Host.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Host.java index 47b7c5f..6d73380 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/Host.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/Host.java @@ -5,7 +5,7 @@ import ch.qos.cal10n.BaseName; public class Host { @BaseName("colors") - enum OtherColors { + public enum OtherColors { RED { }, diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/MiscUtilTest.java similarity index 59% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/util/MiscUtilTest.java index 537b798..a248c16 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/MiscUtilTest.java @@ -19,41 +19,35 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n.util; -import java.util.Locale; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; -import org.junit.Ignore; -import org.junit.Test; - -import ch.qos.cal10n.IMessageConveyor; -import ch.qos.cal10n.MessageConveyor; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; -// with caching ~300 nanos per translation -// without caching 149'963 nanos or 149 micros per translation +import org.junit.Test; -public class MessageConveyorPerftest { - static int RUN_LENGTH = 100 *1000; - public String s; +public class MiscUtilTest { - double loop() { - long start = System.nanoTime(); - - IMessageConveyor mc = new MessageConveyor(Locale.ENGLISH); - for(int i = 0; i < RUN_LENGTH; i++) { - s = mc.getMessage(Colors.BLUE); - } - long end = System.nanoTime(); - return (end - start) * 1.0 / RUN_LENGTH; + @Test + public void urlToFile() { + ClassLoader classLoader = this.getClass().getClassLoader(); + String resourceCandidate = "colors" + "_" + "en" + ".properties"; + URL url = classLoader.getResource(resourceCandidate); + assertNotNull("the problem is in this test, not the code tested", url); + + File file = MiscUtil.urlToFile(url); + assertNotNull(file); } - @Ignore @Test - public void perfTest() { - loop(); - loop(); - - System.out.println("avg = "+loop()); + public void httpUrlToFile() throws MalformedURLException { + URL url = new URL("http://www.xyz.com"); + File file = MiscUtil.urlToFile(url); + assertNull(file); } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java index fa5217e..857db24 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java @@ -27,6 +27,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { AnnotationExtractorTest.class }) +@SuiteClasses( { AnnotationExtractorTest.class, MiscUtilTest.class, + PropertyResourceBundleFinderTest.class }) public class PackageTest { } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java index ab02b10..628f096 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java @@ -22,13 +22,8 @@ package ch.qos.cal10n.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; import java.util.Locale; import java.util.ResourceBundle; @@ -66,21 +61,5 @@ public class PropertyResourceBundleFinderTest { assertEquals("A is the first letter of the alphabet", rb.getString("A")); } - @Test - public void urlToFile() { - ClassLoader classLoader = this.getClass().getClassLoader(); - String resourceCandidate = "colors" + "_" + "en" + ".properties"; - URL url = classLoader.getResource(resourceCandidate); - assertNotNull("the problem is in this test, not the code tested", url); - File file = PropertyResourceBundleFinder.urlToFile(url); - assertNotNull(file); - } - - @Test - public void httpUrlToFile() throws MalformedURLException { - URL url = new URL("http://www.xyz.com"); - File file = PropertyResourceBundleFinder.urlToFile(url); - assertNull(file); - } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java similarity index 90% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java index c0d67c5..13288bc 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageKeyVerifierTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MessageKeyVerifierTest.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n.verifier; import static org.junit.Assert.assertEquals; @@ -29,9 +29,8 @@ import java.util.Locale; import org.junit.Test; -import ch.qos.cal10n.verifier.Cal10nError; -import ch.qos.cal10n.verifier.IMessageKeyVerifier; -import ch.qos.cal10n.verifier.MessageKeyVerifier; +import ch.qos.cal10n.sample.Colors; +import ch.qos.cal10n.sample.Countries; /** * diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MyAllInOneColorVerificationTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyAllInOneColorVerificationTest.java similarity index 87% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MyAllInOneColorVerificationTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyAllInOneColorVerificationTest.java index 5af05d3..680bf90 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MyAllInOneColorVerificationTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyAllInOneColorVerificationTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n.verifier; import static org.junit.Assert.assertEquals; @@ -28,9 +28,7 @@ import java.util.List; import org.junit.Test; -import ch.qos.cal10n.verifier.Cal10nError; -import ch.qos.cal10n.verifier.IMessageKeyVerifier; -import ch.qos.cal10n.verifier.MessageKeyVerifier; +import ch.qos.cal10n.sample.Colors; /** * diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MyColorVerificationTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyColorVerificationTest.java similarity index 88% rename from cal10n-api/src/test/java/ch/qos/cal10n/sample/MyColorVerificationTest.java rename to cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyColorVerificationTest.java index 1624fd4..b51ad51 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MyColorVerificationTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/MyColorVerificationTest.java @@ -19,7 +19,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package ch.qos.cal10n.sample; +package ch.qos.cal10n.verifier; import static org.junit.Assert.assertEquals; @@ -29,9 +29,7 @@ import java.util.Locale; import org.junit.Test; -import ch.qos.cal10n.verifier.Cal10nError; -import ch.qos.cal10n.verifier.IMessageKeyVerifier; -import ch.qos.cal10n.verifier.MessageKeyVerifier; +import ch.qos.cal10n.sample.Colors; public class MyColorVerificationTest { diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/PackageTest.java similarity index 87% copy from cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java copy to cal10n-api/src/test/java/ch/qos/cal10n/verifier/PackageTest.java index fa5217e..e07e691 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/PackageTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/verifier/PackageTest.java @@ -20,13 +20,14 @@ * SOFTWARE. */ -package ch.qos.cal10n.util; +package ch.qos.cal10n.verifier; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { AnnotationExtractorTest.class }) +@SuiteClasses( { MessageKeyVerifierTest.class, MyColorVerificationTest.class, + MyAllInOneColorVerificationTest.class }) public class PackageTest { } ----------------------------------------------------------------------- Summary of changes: .../cal10n/util/CAL10NPropertyResourceBundle.java | 10 +++- .../util/{StringToLocale.java => MiscUtil.java} | 20 ++++++- .../cal10n/util/PropertyResourceBundleFinder.java | 18 +----- .../ch/qos/cal10n/verifier/MessageKeyVerifier.java | 4 +- .../src/test/java/ch/qos/cal10n/AllCal10nTest.java | 7 +- .../{sample => }/MessageConveyorPerftest.java | 5 +- .../ch/qos/cal10n/MessageConveyorReloadTest.java | 64 ++++++++++++++++++++ .../cal10n/{sample => }/MessageConveyorTest.java | 24 ++++++- .../ch/qos/cal10n/{sample => }/PackageTest.java | 5 +- .../src/test/java/ch/qos/cal10n/sample/Host.java | 2 +- ...otationExtractorTest.java => MiscUtilTest.java} | 34 ++++++----- .../test/java/ch/qos/cal10n/util/PackageTest.java | 3 +- .../util/PropertyResourceBundleFinderTest.java | 21 ------- .../MessageKeyVerifierTest.java | 7 +- .../MyAllInOneColorVerificationTest.java | 6 +- .../MyColorVerificationTest.java | 6 +- .../qos/cal10n/{util => verifier}/PackageTest.java | 5 +- 17 files changed, 155 insertions(+), 86 deletions(-) rename cal10n-api/src/main/java/ch/qos/cal10n/util/{StringToLocale.java => MiscUtil.java} (77%) rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => }/MessageConveyorPerftest.java (91%) create mode 100644 cal10n-api/src/test/java/ch/qos/cal10n/MessageConveyorReloadTest.java rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => }/MessageConveyorTest.java (79%) rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => }/PackageTest.java (85%) copy cal10n-api/src/test/java/ch/qos/cal10n/util/{AnnotationExtractorTest.java => MiscUtilTest.java} (60%) rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => verifier}/MessageKeyVerifierTest.java (90%) rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => verifier}/MyAllInOneColorVerificationTest.java (87%) rename cal10n-api/src/test/java/ch/qos/cal10n/{sample => verifier}/MyColorVerificationTest.java (88%) copy cal10n-api/src/test/java/ch/qos/cal10n/{util => verifier}/PackageTest.java (87%) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6-2-g78f0bec
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via 78f0bec7c34006d8db9796952102cee3ea0fe9f5 (commit) from 2f05b5c32a36c116bc1ed8f8f53f7cf3e2716d50 (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=78f0bec7c34006d8db9796952… http://github.com/ceki/cal10n/commit/78f0bec7c34006d8db9796952102cee3ea0fe9… commit 78f0bec7c34006d8db9796952102cee3ea0fe9f5 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 21:58:06 2009 +0200 - test show 500 fold improvement in MessageConveyor performance diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java new file mode 100644 index 0000000..537b798 --- /dev/null +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorPerftest.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2009 QOS.ch All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package ch.qos.cal10n.sample; + +import java.util.Locale; + +import org.junit.Ignore; +import org.junit.Test; + +import ch.qos.cal10n.IMessageConveyor; +import ch.qos.cal10n.MessageConveyor; + +// with caching ~300 nanos per translation +// without caching 149'963 nanos or 149 micros per translation + +public class MessageConveyorPerftest { + + static int RUN_LENGTH = 100 *1000; + public String s; + + double loop() { + long start = System.nanoTime(); + + IMessageConveyor mc = new MessageConveyor(Locale.ENGLISH); + for(int i = 0; i < RUN_LENGTH; i++) { + s = mc.getMessage(Colors.BLUE); + } + long end = System.nanoTime(); + return (end - start) * 1.0 / RUN_LENGTH; + } + + @Ignore + @Test + public void perfTest() { + loop(); + loop(); + + System.out.println("avg = "+loop()); + } +} diff --git a/cal10n-site/src/site/pages/news.html b/cal10n-site/src/site/pages/news.html index 8703581..60f5914 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -32,7 +32,7 @@ <h3>xx of September 2009 - Release of CAL10N version 0.6.5</h3> <p><code>MessageConveyor</code> now caches resource bundles for - dramatically improved performance.</p> + dramatically (500 fold) improved performance.</p> <p>Resource bundles are reloaded upon change.</p> ----------------------------------------------------------------------- Summary of changes: ...ationTest.java => MessageConveyorPerftest.java} | 52 +++++++++++-------- cal10n-site/src/site/pages/news.html | 2 +- 2 files changed, 31 insertions(+), 23 deletions(-) copy cal10n-api/src/test/java/ch/qos/cal10n/sample/{MyAllInOneColorVerificationTest.java => MessageConveyorPerftest.java} (60%) hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6-1-g2f05b5c
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via 2f05b5c32a36c116bc1ed8f8f53f7cf3e2716d50 (commit) from e15eefb1a0752d02f9ddf0644c3168611b450247 (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=2f05b5c32a36c116bc1ed8f8f… http://github.com/ceki/cal10n/commit/2f05b5c32a36c116bc1ed8f8f53f7cf3e2716d… commit 2f05b5c32a36c116bc1ed8f8f53f7cf3e2716d50 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 21:29:32 2009 +0200 - MessageConveyor now caches resource bundles for dramatically improved performance. - Resource bundles are reloaded upon change. diff --git a/cal10n-api/pom.xml b/cal10n-api/pom.xml index b1cca6e..c40b7c1 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.6</version> + <version>0.6.5</version> </parent> <modelVersion>4.0.0</modelVersion> 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 14c4275..02abc0e 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/IMessageConveyor.java @@ -55,7 +55,7 @@ public interface IMessageConveyor { * optional arguments * @return The translated/localized message */ - <E extends Enum<?>> String getMessage(E key, Object... args); + <E extends Enum<?>> String getMessage(E key, Object... args) throws MessageConveyorException; /** * Syntactic sugar for the case where the massage is contained in a @@ -73,5 +73,5 @@ public interface IMessageConveyor { * The MessageParameterObj to translate * @return translated message */ - String getMessage(MessageParameterObj mpo); + String getMessage(MessageParameterObj mpo) throws MessageConveyorException; } 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 17069e2..4d05573 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyor.java @@ -24,9 +24,11 @@ package ch.qos.cal10n; import java.text.MessageFormat; import java.util.Locale; -import java.util.ResourceBundle; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import ch.qos.cal10n.util.AnnotationExtractor; +import ch.qos.cal10n.util.CAL10NPropertyResourceBundle; import ch.qos.cal10n.util.PropertyResourceBundleFinder; /** @@ -40,7 +42,9 @@ import ch.qos.cal10n.util.PropertyResourceBundleFinder; */ public class MessageConveyor implements IMessageConveyor { - Locale locale; + final Locale locale; + + final Map<String, CAL10NPropertyResourceBundle> cache = new ConcurrentHashMap<String, CAL10NPropertyResourceBundle>(); /** * The {@link Locale} associated with this instance. @@ -64,20 +68,16 @@ public class MessageConveyor implements IMessageConveyor { * an enum instance used as message key * */ - public <E extends Enum<?>> String getMessage(E key, Object... args) { - String keyAsStr = key.toString(); + public <E extends Enum<?>> String getMessage(E key, Object... args) throws MessageConveyorException { - String baseName = AnnotationExtractor.getBaseName(key.getDeclaringClass()); - if (baseName == null) { - throw new IllegalArgumentException( - "Missing @BaseName annotation in enum type [" - + key.getClass().getName() + "]. See also " - + Cal10nConstants.MISSING_BN_ANNOTATION_URL); + String declararingClassName = key.getDeclaringClass().getName(); + CAL10NPropertyResourceBundle rb = cache.get(declararingClassName); + if (rb == null || rb.hasChanged()) { + rb = lookup(key); + cache.put(declararingClassName, rb); } - ResourceBundle rb = PropertyResourceBundleFinder.getBundle(this.getClass() - .getClassLoader(), baseName, locale); - + String keyAsStr = key.toString(); String value = rb.getString(keyAsStr); if (value == null) { return "No key found for " + keyAsStr; @@ -90,7 +90,26 @@ public class MessageConveyor implements IMessageConveyor { } } - public String getMessage(MessageParameterObj mpo) { + private <E extends Enum<?>> CAL10NPropertyResourceBundle lookup(E key) throws MessageConveyorException { + 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); + } + CAL10NPropertyResourceBundle rb = PropertyResourceBundleFinder.getBundle(this.getClass() + .getClassLoader(), baseName, locale); + + 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"); diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyorException.java similarity index 72% copy from cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java copy to cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyorException.java index b708cee..bae5c6e 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/MessageConveyorException.java @@ -19,21 +19,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package ch.qos.cal10n.util; +package ch.qos.cal10n; -import java.io.IOException; -import java.io.InputStream; -import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; -public class CAL10NPropertyResourceBundle extends PropertyResourceBundle { +public class MessageConveyorException extends RuntimeException { - public CAL10NPropertyResourceBundle(InputStream is) throws IOException { - super(is); - } + private static final long serialVersionUID = 175752418665292427L; - public void setParent(ResourceBundle parent) { - super.setParent(parent); + MessageConveyorException(String msg) { + super(msg); } - + } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java index b708cee..fec35be 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/CAL10NPropertyResourceBundle.java @@ -21,6 +21,7 @@ */ package ch.qos.cal10n.util; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.PropertyResourceBundle; @@ -28,12 +29,40 @@ import java.util.ResourceBundle; public class CAL10NPropertyResourceBundle extends PropertyResourceBundle { - public CAL10NPropertyResourceBundle(InputStream is) throws IOException { + static long CHECK_DELAY = 10 * 60 * 1000; // 10 minutes delay + + File hostFile; + volatile long nextCheck; + long lastModified; + + public CAL10NPropertyResourceBundle(InputStream is, File file) + throws IOException { super(is); + this.hostFile = file; + nextCheck = System.currentTimeMillis() + CHECK_DELAY; } public void setParent(ResourceBundle parent) { super.setParent(parent); } + public boolean hasChanged() { + //if the host file is unknown, no point in a check + if (hostFile == null) { + return false; + } + + long now = System.currentTimeMillis(); + if (now < nextCheck) { + return false; + } else { + nextCheck = now + CHECK_DELAY; + if (lastModified != hostFile.lastModified()) { + lastModified = hostFile.lastModified(); + return true; + } else { + return false; + } + } + } } diff --git a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java b/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java index 7ecdf89..6b102f4 100644 --- a/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java +++ b/cal10n-api/src/main/java/ch/qos/cal10n/util/PropertyResourceBundleFinder.java @@ -21,16 +21,16 @@ */ package ch.qos.cal10n.util; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; import java.util.Locale; -import java.util.ResourceBundle; public class PropertyResourceBundleFinder { - public static ResourceBundle getBundle(ClassLoader classLoader, String baseName, + public static CAL10NPropertyResourceBundle getBundle(ClassLoader classLoader, String baseName, Locale locale) { // same as the JDK convention @@ -70,7 +70,7 @@ public class PropertyResourceBundleFinder { if (url != null) { try { InputStream in = openConnectionForUrl(url); - prb = new CAL10NPropertyResourceBundle(in); + prb = new CAL10NPropertyResourceBundle(in, urlToFile(url)); in.close(); } catch (IOException e) { } @@ -78,6 +78,21 @@ public class PropertyResourceBundleFinder { return prb; } + static File urlToFile(URL url) { + if(url.getProtocol() != "file") { + return null; + } + String path = url.getPath(); + if(path == null) + return null; + File candidate = new File(path); + if(candidate.exists()) { + return candidate; + } else { + return null; + } + } + private static String computeLanguageAndCountryCandidate(String baseName, Locale locale) { String language = locale.getLanguage(); diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java index bdd7ba8..6d8e987 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/sample/MessageConveyorTest.java @@ -23,12 +23,14 @@ package ch.qos.cal10n.sample; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.util.Locale; import org.junit.Test; import ch.qos.cal10n.MessageConveyor; +import ch.qos.cal10n.MessageConveyorException; import ch.qos.cal10n.MessageParameterObj; import ch.qos.cal10n.sample.Host.OtherColors; @@ -90,4 +92,18 @@ public class MessageConveyorTest { val = rbbmc.getMessage(mpo); assertEquals("apples are green", val); } + + @Test + public void failedRBLookup() { + + MessageConveyor mc = new MessageConveyor(Locale.CHINA); + try { + mc.getMessage(Colors.BLUE); + fail("missing exception"); + } catch (MessageConveyorException e) { + assertEquals( + "Failed to locate resource bundle [colors] for locale [zh_CN] for enum type [ch.qos.cal10n.sample.Colors]", + e.getMessage()); + } + } } diff --git a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java index 323f4d2..ab02b10 100644 --- a/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java +++ b/cal10n-api/src/test/java/ch/qos/cal10n/util/PropertyResourceBundleFinderTest.java @@ -22,8 +22,13 @@ package ch.qos.cal10n.util; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import java.io.File; import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Locale; import java.util.ResourceBundle; @@ -60,4 +65,22 @@ public class PropertyResourceBundleFinderTest { "foobar.sample", Locale.ENGLISH); assertEquals("A is the first letter of the alphabet", rb.getString("A")); } + + @Test + public void urlToFile() { + ClassLoader classLoader = this.getClass().getClassLoader(); + String resourceCandidate = "colors" + "_" + "en" + ".properties"; + URL url = classLoader.getResource(resourceCandidate); + assertNotNull("the problem is in this test, not the code tested", url); + + File file = PropertyResourceBundleFinder.urlToFile(url); + assertNotNull(file); + } + + @Test + public void httpUrlToFile() throws MalformedURLException { + URL url = new URL("http://www.xyz.com"); + File file = PropertyResourceBundleFinder.urlToFile(url); + assertNull(file); + } } diff --git a/cal10n-site/pom.xml b/cal10n-site/pom.xml index 380f65e..c5fefa4 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.6</version> + <version>0.6.5</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 488a47f..8703581 100644 --- a/cal10n-site/src/site/pages/news.html +++ b/cal10n-site/src/site/pages/news.html @@ -29,6 +29,15 @@ <hr width="80%" align="center" /> + <h3>xx of September 2009 - Release of CAL10N version 0.6.5</h3> + + <p><code>MessageConveyor</code> now caches resource bundles for + dramatically improved performance.</p> + + <p>Resource bundles are reloaded upon change.</p> + + <hr width="80%" align="center" /> + <h3>2nd of September 2009 - Release of CAL10N version 0.6</h3> <p>Fixed issue <a href="http://jira.qos.ch/browse/CAL-1">CAL-1</a> diff --git a/maven-cal10n-plugin-smoke/pom.xml b/maven-cal10n-plugin-smoke/pom.xml index 7103297..a7f6cc8 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.6</version> + <version>0.6.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/maven-cal10n-plugin/pom.xml b/maven-cal10n-plugin/pom.xml index 755b2e6..476b445 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.6</version> + <version>0.6.5</version> </parent> <groupId>ch.qos.cal10n.plugins</groupId> diff --git a/pom.xml b/pom.xml index b10eb01..236a95b 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.6</version> + <version>0.6.5</version> <name>Compiler assisted localization library (CAL10N) - Parent</name> <url>http://cal10n.qos.ch</url> ----------------------------------------------------------------------- Summary of changes: cal10n-api/pom.xml | 2 +- .../main/java/ch/qos/cal10n/IMessageConveyor.java | 4 +- .../main/java/ch/qos/cal10n/MessageConveyor.java | 47 ++++++++++++++------ .../ch/qos/cal10n/MessageConveyorException.java} | 18 ++++---- .../cal10n/util/CAL10NPropertyResourceBundle.java | 31 ++++++++++++- .../cal10n/util/PropertyResourceBundleFinder.java | 21 ++++++++- .../ch/qos/cal10n/sample/MessageConveyorTest.java | 16 +++++++ .../util/PropertyResourceBundleFinderTest.java | 23 ++++++++++ cal10n-site/pom.xml | 2 +- cal10n-site/src/site/pages/news.html | 9 ++++ maven-cal10n-plugin-smoke/pom.xml | 2 +- maven-cal10n-plugin/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 145 insertions(+), 34 deletions(-) copy cal10n-api/src/{test/java/ch/qos/cal10n/sample/Furnitures.java => main/java/ch/qos/cal10n/MessageConveyorException.java} (81%) hooks/post-receive -- Compiler assisted localization library

1 0

Release of CAL10N 0.6
by Ceki Gulcu 02 Sep '09

02 Sep '09

2nd of September 2009 - Release of CAL10N 0.6 I am happy to announce the immediate availability of CAL10N version 0.6. 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 cal10n announce mailing list. To subscribe to cal10n-announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/cal10n-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.6, updated. v0.6
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The annotated tag, v0.6 has been updated to 9c3cf551d270aaf1bf86225124a464e36d0fc422 (tag) from 460d078acbbe6379caf1c94d4098cef06346c218 (which is now obsolete) tagging e15eefb1a0752d02f9ddf0644c3168611b450247 (commit) replaces v0.5.1 tagged by Ceki Gulcu on Wed Sep 2 19:55:19 2009 +0200 - Log ----------------------------------------------------------------- re-tagging as 0.6 Ceki Gulcu (6): Fixing CAL-1 Added CAL-1 to the list of bugs fixed in 0.5.2 - Renamed the ResourceBundleName annotation as BaseName which is - defined a simplified bundle lookup procedure - Preparing release 0.6 - correction of typographical errors ----------------------------------------------------------------------- hooks/post-receive -- Compiler assisted localization library

1 0

branch, master, updated. v0.6-1-ge15eefb
by git-noreply＠pixie.qos.ch 02 Sep '09

02 Sep '09

The branch, master has been updated via e15eefb1a0752d02f9ddf0644c3168611b450247 (commit) from 5b6f28829e7b0c5bc8041db251c8f9de991a054e (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=e15eefb1a0752d02f9ddf0644… http://github.com/ceki/cal10n/commit/e15eefb1a0752d02f9ddf0644c3168611b4502… commit e15eefb1a0752d02f9ddf0644c3168611b450247 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 2 19:54:25 2009 +0200 - correction of typographical errors diff --git a/cal10n-site/src/site/pages/manual.html b/cal10n-site/src/site/pages/manual.html index e180c46..913bb20 100644 --- a/cal10n-site/src/site/pages/manual.html +++ b/cal10n-site/src/site/pages/manual.html @@ -153,11 +153,11 @@ String blue = mc.getMessage(Colors.BLUE); </pre> </p> <h2><a name="simplifiedLookup" href="#simplifiedLookup">Simplified - bundle lookup procedure</a></h2> + bundle look-up procedure</a></h2> <p>The <code>ResourceBundle</code> class defines a rather involved <a - href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/ResourceBundle.html#getBu…">lookup + href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/ResourceBundle.html#getBu…">look-up procedure</a> for finding resource bundles. While formally this procedure is deterministic, it is too error-prone for our taste. In CAL10N, we thus took the bold initiative to define a simplified bundle look @@ -193,11 +193,11 @@ colors_fr_FR.properties</pre> relationship. </p> - <p>We hope that the simplified lookup procedeue, while deviating + <p>We hope that the simplified look-up procedure, while deviating from the conventions of the Java platform as defined in the <code>ResourceBundle</code> class, will still cause <a href="http://en.wikipedia.org/wiki/Principle_of_least_astonishment"> - less suprises</a>.</p> + less surprise</a>.</p> <h2><a name="deferred" href="#deferred">Deferred localization</a></h2> @@ -277,11 +277,11 @@ public class MyColorVerificationTest { the <code>verify()</code> method passing a locale as an argument. The <code>verify()</code> method returns the list of errors, that is the list of discrepancies between the keys listed - in the enum type and the correspondign resource bundle. An empty + in the enum type and the corresponding resource bundle. An empty list will be returned if there are no errors. </p> - <p>The unit test verifies that no errors have occured by asserting + <p>The unit test verifies that no errors have occurred by asserting that the size of the error list is zero.</p> <p>Suppose the key "BLUE" was misspelled as "BLEU" in the @@ -391,7 +391,7 @@ public class MyAllInOneColorVerificationTest { <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 + for CAL10N. Below is a list of possible features of this IDE which we think could have added value. </p> @@ -408,7 +408,7 @@ public class MyAllInOneColorVerificationTest { user misspells the key "red_elephant" as "red_elefant", by measuring the <a href="http://en.wikipedia.org/wiki/Levenshtein_distance">Levenshtein - distance</a> the plug-in could propose the nearest neighhbor of + distance</a> the plug-in could propose the nearest neighbor of "red_elefant" in the enum type, which should be "red_elephant" with high probability. </p> @@ -428,7 +428,7 @@ public class MyAllInOneColorVerificationTest { <p>We are looking for volunteers to implement an Ant task to verify resource bundles. The Ant task could be modeled after the - <em>maven-cal10n-plugin</em> altough the Ant plugin is likely to be + <em>maven-cal10n-plugin</em> although the Ant plugin is likely to be simpler. If interested please contact the cal10n-dev mailing list.</p> ----------------------------------------------------------------------- Summary of changes: cal10n-site/src/site/pages/manual.html | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- Compiler assisted localization library

1 0