From ff8d8be005de2e4819860165ae34ac5733b0877c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 27 Jan 2016 16:36:12 +0100
Subject: [PATCH] no-jira: backport some changes for weblogic compatibility
---
.../org/olat/core/servlets/StaticServlet.java | 3 ++
.../java/org/olat/core/util/WebappHelper.java | 12 +++--
.../org/olat/core/util/i18n/I18nManager.java | 44 ++++++++++---------
.../org/olat/core/util/i18n/I18nModule.java | 36 +++++++++++----
.../util/i18n/_spring/i18nCorecontext.xml | 2 +-
5 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/olat/core/servlets/StaticServlet.java b/src/main/java/org/olat/core/servlets/StaticServlet.java
index 86a20d3e608..b51938d0924 100644
--- a/src/main/java/org/olat/core/servlets/StaticServlet.java
+++ b/src/main/java/org/olat/core/servlets/StaticServlet.java
@@ -129,6 +129,9 @@ public class StaticServlet extends HttpServlet {
expiration &= false;
} else {
staticAbsPath = WebappHelper.getContextRealPath(STATIC_DIR_NAME);
+ if(staticAbsPath == null) {
+ staticAbsPath = WebappHelper.getContextRoot() + STATIC_DIR_NAME;
+ }
expiration &= true;
}
diff --git a/src/main/java/org/olat/core/util/WebappHelper.java b/src/main/java/org/olat/core/util/WebappHelper.java
index 5845c5d1592..ac187cbe8a8 100644
--- a/src/main/java/org/olat/core/util/WebappHelper.java
+++ b/src/main/java/org/olat/core/util/WebappHelper.java
@@ -263,10 +263,16 @@ public class WebappHelper implements Initializable, Destroyable, ServletContextA
try {
String resource = "/serviceconfig/olat.properties";
Resource res = new ClassPathResource(resource);
- String path = res.getFile().getParentFile().getParentFile().getAbsolutePath();
- return path;
+ String protocol = res.getURL().getProtocol();
+ if("file".equals(protocol)) {
+ String path = res.getFile().getParentFile().getParentFile().getAbsolutePath();
+ return path;
+ } else {
+ return null;
+ }
} catch (IOException e) {
- throw new StartupException("could not find classpath resource: 'serviceconfig/olat.properties'", e);
+ log.error("Path to build output is not accessible", e);
+ return null;
}
}
diff --git a/src/main/java/org/olat/core/util/i18n/I18nManager.java b/src/main/java/org/olat/core/util/i18n/I18nManager.java
index 6165d3a4caa..1d96939ef14 100644
--- a/src/main/java/org/olat/core/util/i18n/I18nManager.java
+++ b/src/main/java/org/olat/core/util/i18n/I18nManager.java
@@ -1775,27 +1775,31 @@ public class I18nManager extends BasicManager {
} else {
// Fall back to compiled classes
srcPath = WebappHelper.getBuildOutputFolderRoot();
- }
- I18nDirectoriesVisitor srcVisitor = new I18nDirectoriesVisitor(srcPath);
- FileUtils.visitRecursively(new File(srcPath), srcVisitor);
- foundBundles = srcVisitor.getBundlesContainingI18nFiles();
- // 3) For jUnit tests, add also the I18n test dir
- if (Settings.isJUnitTest()) {
- Resource testres = new ClassPathResource("olat.local.properties");
- String jUnitSrcPath = null;
- try {
- jUnitSrcPath = testres.getFile().getAbsolutePath();
- } catch (IOException e) {
- throw new StartupException("Could not find classpath resource for: test-classes/olat.local.property ", e);
- }
-
-
- I18nDirectoriesVisitor juniSrcVisitor = new I18nDirectoriesVisitor(jUnitSrcPath);
- FileUtils.visitRecursively(new File(jUnitSrcPath), juniSrcVisitor);
- foundBundles.addAll(juniSrcVisitor.getBundlesContainingI18nFiles());
}
- // Sort alphabetically
- Collections.sort(foundBundles);
+ if(StringHelper.containsNonWhitespace(srcPath)) {
+ I18nDirectoriesVisitor srcVisitor = new I18nDirectoriesVisitor(srcPath);
+ FileUtils.visitRecursively(new File(srcPath), srcVisitor);
+ foundBundles = srcVisitor.getBundlesContainingI18nFiles();
+ // 3) For jUnit tests, add also the I18n test dir
+ if (Settings.isJUnitTest()) {
+ Resource testres = new ClassPathResource("olat.local.properties");
+ String jUnitSrcPath = null;
+ try {
+ jUnitSrcPath = testres.getFile().getAbsolutePath();
+ } catch (IOException e) {
+ throw new StartupException("Could not find classpath resource for: test-classes/olat.local.property ", e);
+ }
+
+
+ I18nDirectoriesVisitor juniSrcVisitor = new I18nDirectoriesVisitor(jUnitSrcPath);
+ FileUtils.visitRecursively(new File(jUnitSrcPath), juniSrcVisitor);
+ foundBundles.addAll(juniSrcVisitor.getBundlesContainingI18nFiles());
+ }
+ // Sort alphabetically
+ Collections.sort(foundBundles);
+ } else {
+ foundBundles = new ArrayList<String>();
+ }
return foundBundles;
}
diff --git a/src/main/java/org/olat/core/util/i18n/I18nModule.java b/src/main/java/org/olat/core/util/i18n/I18nModule.java
index 97b17aabc40..7ee785005df 100644
--- a/src/main/java/org/olat/core/util/i18n/I18nModule.java
+++ b/src/main/java/org/olat/core/util/i18n/I18nModule.java
@@ -300,17 +300,35 @@ public class I18nModule extends AbstractOLATModule implements Destroyable {
}
}
- File libDir = new File(WebappHelper.getBuildOutputFolderRoot());
- for (String languageCode : i18nMgr.searchForAvailableLanguages(libDir)) {
- if (availableLanguages.contains(languageCode)) {
- logDebug("Skipping duplicate or previously loaded language::" + languageCode + " found in " + libDir.getAbsolutePath(), null);
- continue;
+ String folderRoot = WebappHelper.getBuildOutputFolderRoot();
+ if(StringHelper.containsNonWhitespace(folderRoot)) {
+ //started from WEB-INF/classes
+ File libDir = new File(WebappHelper.getBuildOutputFolderRoot());
+ for (String languageCode : i18nMgr.searchForAvailableLanguages(libDir)) {
+ if (availableLanguages.contains(languageCode)) {
+ logDebug("Skipping duplicate or previously loaded language::" + languageCode + " found in " + libDir.getAbsolutePath(), null);
+ continue;
+ }
+ logDebug("Detected non-translatable language " + languageCode + " in " + libDir.getAbsolutePath(), null);
+ availableLanguages.add(languageCode);
+ // don't add to translatable languages nor to source lookup maps - those
+ // langs are read only
+ }
+ } else {
+ //started from jar (like weblogic does) -> load from the configuration
+ String enabledLanguagesConfig = getStringPropertyValue(CONFIG_LANGUAGES_ENABLED, false);
+ String[] enabledLanguages = enabledLanguagesConfig.split(",");
+ for (String languageCode : enabledLanguages) {
+ if (availableLanguages.contains(languageCode)) {
+ logWarn("Skipping duplicate or previously loaded language::" + languageCode + " found in "
+ + LANG_PACKS_DIRECTORY.getAbsolutePath(), null);
+ continue;
+ }
+ logDebug("Force non-translatable language " + languageCode + " defined from enabledLanguages.", null);
+ availableLanguages.add(languageCode);
}
- logDebug("Detected non-translatable language " + languageCode + " in " + libDir.getAbsolutePath(), null);
- availableLanguages.add(languageCode);
- // don't add to translatable languages nor to source lookup maps - those
- // langs are read only
}
+
// 4) Add languages from the customizing lang packs
for (String languageCode : i18nMgr.searchForAvailableLanguages(LANG_PACKS_DIRECTORY)) {
if (availableLanguages.contains(languageCode)) {
diff --git a/src/main/java/org/olat/core/util/i18n/_spring/i18nCorecontext.xml b/src/main/java/org/olat/core/util/i18n/_spring/i18nCorecontext.xml
index 0a8c43c01b3..0083981366b 100644
--- a/src/main/java/org/olat/core/util/i18n/_spring/i18nCorecontext.xml
+++ b/src/main/java/org/olat/core/util/i18n/_spring/i18nCorecontext.xml
@@ -4,7 +4,7 @@
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="I18nManager" class="org.olat.core.util.i18n.I18nManager" />
--
GitLab