Author: simoneg
Date: Tue Jan 12 18:00:37 2010
New Revision: 898444
URL: http://svn.apache.org/viewvc?rev=898444&view=rev
Log:
Fix for i18n files parsing order
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java?rev=898444&r1=898443&r2=898444&view=diff
==============================================================================
---
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
(original)
+++
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
Tue Jan 12 18:00:37 2010
@@ -86,9 +86,6 @@
load("META-INF/messages.default.", locales);
load("META-INF/messages.", locales);
- for (Locale locale : locales) {
- messages.overrideWith(new File("messages." +
locale.toString().toLowerCase()));
- }
messages.inited();
}
@@ -98,8 +95,13 @@
String url = base +
locale.toString().toLowerCase() + ".properties";
url = url.replaceAll("\\.\\.", ".");
Enumeration<URL> resources =
getClass().getClassLoader().getResources(url);
+ List<URL> reslist = new ArrayList<URL>();
while (resources.hasMoreElements()) {
-
messages.overrideWith(resources.nextElement());
+ reslist.add(resources.nextElement());
+ }
+ Collections.reverse(reslist);
+ for (URL resurl : reslist) {
+ messages.overrideWith(resurl);
}
} catch (IOException e) {
e.printStackTrace();
Modified:
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java?rev=898444&r1=898443&r2=898444&view=diff
==============================================================================
---
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
(original)
+++
labs/magma/trunk/maven-magma-plugin/src/main/java/org/apache/magma/tools/maven/MagmaJettyRun.java
Tue Jan 12 18:00:37 2010
@@ -183,9 +183,6 @@
urls.add(resdir.toURI().toURL());
}
}
- if (this.classesDirectory.exists()) {
- urls.add(this.classesDirectory.toURI().toURL());
- }
// Check for a local paths file
File locpaths = new File(project.getBasedir(),
"magma.locals");
@@ -215,6 +212,10 @@
}
}
}
+
+ if (this.classesDirectory.exists()) {
+ urls.add(this.classesDirectory.toURI().toURL());
+ }
Set artifacts = project.getArtifacts();
for (Iterator iterator = artifacts.iterator();
iterator.hasNext();) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
