Revision: 4130
Author: seba.wagner
Date: Mon Aug 29 13:15:10 2011
Log: Fix for boot problem with custom template in install and some
additional info
http://code.google.com/p/openmeetings/source/detail?r=4130
Added:
/branches/dev/injection/src/templates/booting_install.vm
Modified:
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
=======================================
--- /dev/null
+++ /branches/dev/injection/src/templates/booting_install.vm Mon Aug 29
13:15:10 2011
@@ -0,0 +1,15 @@
+## OpenMeetings
+## author swagner
+## 16.05.2007
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0
Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='de' lang='de'>
+<head>
+<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+</head>
+<body>
+<b>OpenMeetings - Loading ...</b><br />
+The server is not yet completely initialized. Please try again in a couple
of seconds.<br/>
+If this message persists for several minutes contact your
Sys-Administration.<br/>
+If that message stays forever you should check the
red5.log/openmeetings.log, probably your database user/pwd/host is wrong!
+</body>
+</html>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 28 09:53:59 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Mon Aug 29 13:15:10 2011
@@ -7,8 +7,6 @@
import java.util.LinkedHashMap;
import java.util.List;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -21,6 +19,8 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
public class Install extends VelocityViewServlet {
@@ -29,15 +29,18 @@
*/
private static final long serialVersionUID = 3684381243236013771L;
- private ImportInitvalues importInitvalues;
-
- @Override
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- importInitvalues = (ImportInitvalues) config.getServletContext()
- .getAttribute("importInitvalues");
- log.debug("in init: cfgManagement is null ? "
- + (null == importInitvalues) + " ; " +
importInitvalues);
+ private ImportInitvalues getImportInitvalues() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (ImportInitvalues)
context.getBean("importInitvalues");
+ } catch (Exception err) {
+ log.error("[getImportInitvalues]", err);
+ }
+ return null;
}
private static final Logger log = Red5LoggerFactory.getLogger(
@@ -56,6 +59,11 @@
try {
+ if (getImportInitvalues() == null) {
+ return
getVelocityView().getVelocityEngine().getTemplate(
+ "booting_install.vm");
+ }
+
ctx.put("APPLICATION_NAME", getServletContext()
.getServletContextName());
ctx.put("APPLICATION_ROOT",
@@ -91,8 +99,8 @@
ctx.put("error",
"Could not Create
File, Permission set? ");
ctx.put("path", working_dir);
- return
getVelocityView().getVelocityEngine().getTemplate(
- "install_error_" + lang +
".vm");
+ return
getVelocityView().getVelocityEngine()
+
.getTemplate("install_error_" + lang + ".vm");
} else {
InstallationDocumentHandler
.getInstance()
@@ -102,8 +110,8 @@
0);
// File has been created so
follow first step of
// Installation
- return
getVelocityView().getVelocityEngine().getTemplate(
- "install_welcome_" + lang
+ ".vm");
+ return
getVelocityView().getVelocityEngine()
+
.getTemplate("install_welcome_" + lang + ".vm");
}
} else {
@@ -112,7 +120,7 @@
if (i == 0) {
String filePath =
getServletContext().getRealPath("/")
+
ImportInitvalues.languageFolderName;
- LinkedHashMap<Integer, LinkedHashMap<String, Object>>
allLanguagesAll = importInitvalues
+ LinkedHashMap<Integer, LinkedHashMap<String, Object>>
allLanguagesAll = getImportInitvalues()
.getLanguageFiles(filePath);
LinkedHashMap<Integer, String> allLanguages = new
LinkedHashMap<Integer, String>();
for (Iterator<Integer> iter =
allLanguagesAll.keySet()
@@ -129,7 +137,7 @@
allFonts.put("Arial", "Arial");
LinkedHashMap<String, String> allTimeZones = new
LinkedHashMap<String, String>();
- List<OmTimeZone> omTimeZoneList
= importInitvalues
+ List<OmTimeZone> omTimeZoneList
= getImportInitvalues()
.getTimeZones(filePath);
log.debug("omTimeZoneList :: "
+ omTimeZoneList.size());
for (OmTimeZone omTimeZone :
omTimeZoneList) {
@@ -149,8 +157,8 @@
return tpl;
} else {
- return
getVelocityView().getVelocityEngine().getTemplate(
- "install_step2_" + lang +
".vm");
+ return
getVelocityView().getVelocityEngine()
+
.getTemplate("install_step2_" + lang + ".vm");
}
}
@@ -167,7 +175,7 @@
String filePath =
getServletContext().getRealPath("/")
+
ImportInitvalues.languageFolderName;
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> allLanguagesAll
= importInitvalues
+ LinkedHashMap<Integer, LinkedHashMap<String, Object>> allLanguagesAll
= getImportInitvalues()
.getLanguageFiles(filePath);
LinkedHashMap<Integer, String> allLanguages = new
LinkedHashMap<Integer, String>();
for (Iterator<Integer> iter =
allLanguagesAll.keySet()
@@ -184,7 +192,7 @@
allFonts.put("Arial", "Arial");
LinkedHashMap<String, String> allTimeZones = new
LinkedHashMap<String, String>();
- List<OmTimeZone> omTimeZoneList =
importInitvalues
+ List<OmTimeZone> omTimeZoneList =
getImportInitvalues()
.getTimeZones(filePath);
log.debug("omTimeZoneList :: " +
omTimeZoneList.size());
for (OmTimeZone omTimeZone :
omTimeZoneList) {
@@ -327,15 +335,15 @@
"url_feed");
String url_feed2 =
getServletContext().getInitParameter(
"url_feed2");
-
importInitvalues.loadInitLanguages(filePath);
-
- importInitvalues.loadMainMenu();
-
-
importInitvalues.loadErrorMappingsFromXML(filePath);
-
- importInitvalues.loadSalutations();
-
-
importInitvalues.loadConfiguration(crypt_ClassName,
+
getImportInitvalues().loadInitLanguages(filePath);
+
+ getImportInitvalues().loadMainMenu();
+
+
getImportInitvalues().loadErrorMappingsFromXML(filePath);
+
+ getImportInitvalues().loadSalutations();
+
+
getImportInitvalues().loadConfiguration(crypt_ClassName,
configdefault,
configsmtp, configsmtpport,
configreferer,
configmailuser, configmailpass,
mailusetls,
configdefaultLang, swf_path, im_path,
@@ -350,16 +358,16 @@
openxg_adminid,
sip_language_phonecode,
sip_phonerange_start,
sip_phonerange);
-
importInitvalues.loadInitUserAndOrganisation(username,
+
getImportInitvalues().loadInitUserAndOrganisation(username,
userpass, useremail,
orgname, timeZone);
- importInitvalues.loadDefaultRooms();
+
getImportInitvalues().loadDefaultRooms();
// AppointMent Categories
-
importInitvalues.loadInitAppointmentCategories();
+
getImportInitvalues().loadInitAppointmentCategories();
// Appointment Remindertypes
-
importInitvalues.loadInitAppointmentReminderTypes();
+
getImportInitvalues().loadInitAppointmentReminderTypes();
// update to next step
log.debug("add level to install file");
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
