summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMarco Lehmann-Mörz2012-06-04 16:54:17 (EDT)
committer Jan Sievers2012-06-11 04:41:42 (EDT)
commit4d6263b572a75e9ce44849bb6275a0888d7388e3 (patch)
treea4cc3c14b83048f0a97ae15c90fecf17ee98f6e2
parent9773e7e148456b509c595129f224f65ed7ad0df7 (diff)
downloadorg.eclipse.tycho-4d6263b572a75e9ce44849bb6275a0888d7388e3.zip
org.eclipse.tycho-4d6263b572a75e9ce44849bb6275a0888d7388e3.tar.gz
org.eclipse.tycho-4d6263b572a75e9ce44849bb6275a0888d7388e3.tar.bz2
381834 additional l10n fall-back for more OSGi-compliant eclipse-pluginsrefs/changes/10/6310/2
Honor default bundle localization path OSGI-INF/l10n/bundle.properties if bundle header Bundle-Localization not set. Change-Id: I1f6351ac191b1852ded2ac899ff8928d57b9ff17
-rw-r--r--tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java
index 43d5eb5..bd8cef3 100644
--- a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java
+++ b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/OsgiSourceMojo.java
@@ -226,12 +226,16 @@ public class OsgiSourceMojo extends AbstractSourceJarMojo {
private Properties readL10nProps(OsgiManifest manifest) throws MojoExecutionException {
String bundleL10nBase = manifest.getValue(BUNDLE_LOCALIZATION);
if (bundleL10nBase == null) {
- bundleL10nBase = "plugin";
+ bundleL10nBase = BUNDLE_LOCALIZATION_DEFAULT_BASENAME;
}
File l10nPropsFile = new File(project.getBasedir(), bundleL10nBase + ".properties");
if (!l10nPropsFile.isFile()) {
- getLog().warn("bundle localization file " + l10nPropsFile + " not found");
- return null;
+ bundleL10nBase = "plugin";
+ l10nPropsFile = new File(project.getBasedir(), bundleL10nBase + ".properties");
+ if (!l10nPropsFile.isFile()) {
+ getLog().warn("bundle localization file " + l10nPropsFile + " not found");
+ return null;
+ }
}
Properties l10nProps = new Properties();
FileInputStream in = null;