You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/02/15 04:01:37 UTC
svn commit: r1446436 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet:
BaseVelocityViewServlet.java outputhandler/ActivateUser.java
outputhandler/DefaultIndex.java outputhandler/Install.java
Author: solomax
Date: Fri Feb 15 03:01:37 2013
New Revision: 1446436
URL: http://svn.apache.org/r1446436
Log:
Creation of "booting_install.vm" template is generalized
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java?rev=1446436&r1=1446435&r2=1446436&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/BaseVelocityViewServlet.java Fri Feb 15 03:01:37 2013
@@ -18,6 +18,10 @@
*/
package org.apache.openmeetings.servlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.velocity.Template;
import org.apache.velocity.tools.view.VelocityViewServlet;
public abstract class BaseVelocityViewServlet extends VelocityViewServlet {
@@ -28,4 +32,21 @@ public abstract class BaseVelocityViewSe
protected <T> T getBean(Class<T> beanClass) {
return beanUtil.getBean(beanClass, getServletContext());
}
+
+ protected Template getBooting() {
+ return getVelocityView().getVelocityEngine().getTemplate("booting_install.vm");
+ }
+
+ @Override
+ protected void error(HttpServletRequest request, HttpServletResponse response, Throwable e) {
+ if (e instanceof ServerNotInitializedException) {
+ try {
+ mergeTemplate(getBooting(), createContext(request, response), response);
+ return;
+ } catch (Exception e1) {
+ // no-op
+ }
+ }
+ super.error(request, response, e);
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1446436&r1=1446435&r2=1446436&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Fri Feb 15 03:01:37 2013
@@ -30,6 +30,7 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.servlet.BaseVelocityViewServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.red5.logging.Red5LoggerFactory;
@@ -47,14 +48,6 @@ public class ActivateUser extends BaseVe
HttpServletResponse httpServletResponse, Context ctx) {
try {
-
- if (getBean(ConfigurationDao.class) == null
- || getBean(UserManager.class) == null
- || getBean(FieldManager.class) == null) {
- return getVelocityView().getVelocityEngine().getTemplate(
- "booting.vm");
- }
-
String hash = httpServletRequest.getParameter("u");
String loginURL = OpenmeetingsVariables.webAppRootPath;
@@ -139,6 +132,8 @@ public class ActivateUser extends BaseVe
}
+ } catch (ServerNotInitializedException err) {
+ return getBooting();
} catch (Exception err) {
log.error("[ActivateUser]", err);
err.printStackTrace();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1446436&r1=1446435&r2=1446436&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java Fri Feb 15 03:01:37 2013
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.servlet.BaseVelocityViewServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.red5.logging.Red5LoggerFactory;
@@ -44,12 +45,6 @@ public class DefaultIndex extends BaseVe
HttpServletResponse httpServletResponse, Context ctx) {
try {
-
- if (getBean(ConfigurationDao.class) == null) {
- return getVelocityView().getVelocityEngine().getTemplate(
- "booting.vm");
- }
-
String template = "usual_template.vm";
ctx.put("APP_NAME", getBean(ConfigurationDao.class).getAppName());
// Parse the Param for the SWF URL
@@ -108,9 +103,9 @@ public class DefaultIndex extends BaseVe
return getVelocityView().getVelocityEngine().getTemplate(template);
+ } catch (ServerNotInitializedException err) {
+ return getBooting();
} catch (Exception er) {
- System.out.println("Error downloading: " + er);
- er.printStackTrace();
log.error("[Calendar :: service]", er);
}
return null;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java?rev=1446436&r1=1446435&r2=1446436&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java Fri Feb 15 03:01:37 2013
@@ -19,7 +19,6 @@
package org.apache.openmeetings.servlet.outputhandler;
import java.io.File;
-import java.io.IOException;
import java.io.StringWriter;
import java.util.LinkedHashMap;
import java.util.List;
@@ -34,6 +33,7 @@ import org.apache.openmeetings.installat
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.servlet.BaseVelocityViewServlet;
+import org.apache.openmeetings.servlet.ServerNotInitializedException;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.velocity.Template;
@@ -108,21 +108,15 @@ public class Install extends BaseVelocit
* , javax.servlet.http.HttpServletResponse)
*/
@Override
- public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx) {
+ public Template handleRequest(HttpServletRequest request,
+ HttpServletResponse response, Context ctx) {
try {
ctx.put("APP_ROOT", OpenmeetingsVariables.webAppRootKey);
-
- if (getBean(ImportInitvalues.class) == null || getBean(ConfigurationDao.class) == null) {
- return getVelocityView().getVelocityEngine().getTemplate(
- "booting_install.vm");
- }
-
ctx.put("APP_NAME", getBean(ConfigurationDao.class).getAppName());
- String command = httpServletRequest.getParameter("command");
+ String command = request.getParameter("command");
- String lang = httpServletRequest.getParameter("lang");
+ String lang = request.getParameter("lang");
if (lang == null)
lang = "EN";
@@ -153,7 +147,7 @@ public class Install extends BaseVelocit
} else {
int i = InstallationDocumentHandler.getCurrentStepNumber();
if (i == 0) {
- return getStep2Template(httpServletRequest, ctx, lang);
+ return getStep2Template(request, ctx, lang);
} else {
return getVelocityView().getVelocityEngine()
.getTemplate("install_step2_" + lang + ".vm");
@@ -164,7 +158,7 @@ public class Install extends BaseVelocit
int i = InstallationDocumentHandler.getCurrentStepNumber();
if (i == 0) {
- return getStep2Template(httpServletRequest, ctx, lang);
+ return getStep2Template(request, ctx, lang);
} else {
ctx.put("error",
"This Step of the installation has already been done. continue with step 2 <A HREF='?command=step2'>continue with step 2</A>");
@@ -179,47 +173,47 @@ public class Install extends BaseVelocit
log.debug("do init installation");
- String username = httpServletRequest.getParameter("username");
- String userpass = httpServletRequest.getParameter("userpass");
- String useremail = httpServletRequest.getParameter("useremail");
- String orgname = httpServletRequest.getParameter("orgname");
+ String username = request.getParameter("username");
+ String userpass = request.getParameter("userpass");
+ String useremail = request.getParameter("useremail");
+ String orgname = request.getParameter("orgname");
InstallationConfig cfg = new InstallationConfig();
- cfg.allowFrontendRegister = httpServletRequest.getParameter("configdefault");
+ cfg.allowFrontendRegister = request.getParameter("configdefault");
- cfg.mailReferer = httpServletRequest.getParameter("configreferer");
- cfg.smtpServer = httpServletRequest.getParameter("configsmtp");
- cfg.smtpPort = httpServletRequest.getParameter("configsmtpport");
- cfg.mailAuthName = httpServletRequest.getParameter("configmailuser");
- cfg.mailAuthPass = httpServletRequest.getParameter("configmailpass");
- cfg.mailUseTls = httpServletRequest.getParameter("mailusetls");
- cfg.replyToOrganizer = httpServletRequest.getParameter("replyToOrganizer");
-
- cfg.defaultLangId = httpServletRequest.getParameter("configdefaultLang");
- cfg.swfZoom = httpServletRequest.getParameter("swftools_zoom");
- cfg.swfJpegQuality = httpServletRequest.getParameter("swftools_jpegquality");
- cfg.swfPath = httpServletRequest.getParameter("swftools_path");
- cfg.imageMagicPath = httpServletRequest.getParameter("imagemagick_path");
- cfg.sendEmailAtRegister = httpServletRequest.getParameter("sendEmailAtRegister");
- cfg.sendEmailWithVerficationCode = httpServletRequest.getParameter("sendEmailWithVerficationCode");
- cfg.createDefaultRooms = httpServletRequest.getParameter("createDefaultRooms");
+ cfg.mailReferer = request.getParameter("configreferer");
+ cfg.smtpServer = request.getParameter("configsmtp");
+ cfg.smtpPort = request.getParameter("configsmtpport");
+ cfg.mailAuthName = request.getParameter("configmailuser");
+ cfg.mailAuthPass = request.getParameter("configmailpass");
+ cfg.mailUseTls = request.getParameter("mailusetls");
+ cfg.replyToOrganizer = request.getParameter("replyToOrganizer");
+
+ cfg.defaultLangId = request.getParameter("configdefaultLang");
+ cfg.swfZoom = request.getParameter("swftools_zoom");
+ cfg.swfJpegQuality = request.getParameter("swftools_jpegquality");
+ cfg.swfPath = request.getParameter("swftools_path");
+ cfg.imageMagicPath = request.getParameter("imagemagick_path");
+ cfg.sendEmailAtRegister = request.getParameter("sendEmailAtRegister");
+ cfg.sendEmailWithVerficationCode = request.getParameter("sendEmailWithVerficationCode");
+ cfg.createDefaultRooms = request.getParameter("createDefaultRooms");
- cfg.defaultExportFont = httpServletRequest.getParameter("default_export_font");
+ cfg.defaultExportFont = request.getParameter("default_export_font");
- cfg.cryptClassName = httpServletRequest.getParameter("crypt_ClassName");
+ cfg.cryptClassName = request.getParameter("crypt_ClassName");
- cfg.ffmpegPath = httpServletRequest.getParameter("ffmpeg_path");
+ cfg.ffmpegPath = request.getParameter("ffmpeg_path");
- cfg.soxPath = httpServletRequest.getParameter("sox_path");
+ cfg.soxPath = request.getParameter("sox_path");
// red5sip integration config
- cfg.red5SipEnable = httpServletRequest.getParameter("red5sip_enable");
- cfg.red5SipRoomPrefix = httpServletRequest.getParameter("red5sip_room_prefix");
- cfg.red5SipExtenContext = httpServletRequest.getParameter("red5sip_exten_context");
+ cfg.red5SipEnable = request.getParameter("red5sip_enable");
+ cfg.red5SipRoomPrefix = request.getParameter("red5sip_room_prefix");
+ cfg.red5SipExtenContext = request.getParameter("red5sip_exten_context");
- String timeZone = httpServletRequest.getParameter("timeZone");
+ String timeZone = request.getParameter("timeZone");
cfg.ical_timeZone = timeZone;
- cfg.jodPath = httpServletRequest.getParameter("jod_path");
+ cfg.jodPath = request.getParameter("jod_path");
log.debug("step 0+ start init with values. " + username
+ " ***** " + useremail + " " + orgname + " "
@@ -256,9 +250,8 @@ public class Install extends BaseVelocit
}
}
-
- } catch (IOException err) {
- log.error("Install: ", err);
+ } catch (ServerNotInitializedException err) {
+ return getBooting();
} catch (Exception err2) {
log.error("Install: ", err2);
}