Revision: 4303
Author: solomax666
Date: Mon Sep 26 09:24:15 2011
Log: Fixes Issue 1403
- Openmeetings hardcoding was removed from templates
http://code.google.com/p/openmeetings/source/detail?r=4303
Modified:
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/main.lzx
/trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
/trunk/singlewebapp/src/templates/install_step1_EN.vm
/trunk/singlewebapp/src/templates/install_step2_EN.vm
/trunk/singlewebapp/src/templates/install_welcome_EN.vm
/trunk/singlewebapp/src/templates/screencast_jrdesktop.vm
/trunk/singlewebapp/src/templates/screencast_odsp_sharertemplate.vm
/trunk/singlewebapp/src/templates/screencast_odsp_viewertemplate.vm
/trunk/singlewebapp/src/templates/screencast_rtp.vm
/trunk/singlewebapp/src/templates/screencast_template.vm
/trunk/singlewebapp/src/templates/screenshare.vm
/trunk/singlewebapp/src/templates/sip_template.vm
/trunk/singlewebapp/src/templates/usual_template.vm
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun Sep
25 02:55:37 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Mon Sep
26 09:24:15 2011
@@ -1501,10 +1501,10 @@
<value>此房间没有主持人, 但是有参与者. 你可以申请为主持人或者等
待.</value>
</string>
<string id="499" name="feedback_template_subject">
- <value>反馈给Openmeetings</value>
+ <value>反馈给$APP_NAME</value>
</string>
<string id="500" name="invitation_template_head">
- <value>Openmeetings――邀请</value>
+ <value>$APP_NAME――邀请</value>
</string>
<string id="501" name="invitation_text_from">
<value>消息发自:</value>
@@ -1522,7 +1522,7 @@
<value>如果你在此链接遇到问题, 请拷贝并粘贴此链接到浏览器中:</value>
</string>
<string id="506" name="registering_mail_text_head">
- <value>Openmeetings――注册</value>
+ <value>$APP_NAME――注册</value>
</string>
<string id="507" name="registering_mail_text_head2">
<value>你的用户数据:</value>
@@ -1537,13 +1537,13 @@
<value>邮件:</value>
</string>
<string id="511" name="registering_mail_text_bye">
- <value>Openmeetings――团队</value>
+ <value>$APP_NAME――团队</value>
</string>
<string id="512" name="register_mail_subject">
- <value>Openmeetings――注册</value>
+ <value>$APP_NAME――注册</value>
</string>
<string id="513" name="reset_password_template_head">
- <value>Openmeetings――重置密码</value>
+ <value>$APP_NAME――重置密码</value>
</string>
<string id="514" name="reset_password_template_test_link">
<value>点击此链接并键入新密码:</value>
@@ -1555,7 +1555,7 @@
<value>如果你在此链接遇到问题, 请拷贝并粘贴此链接到浏览器中:</value>
</string>
<string id="517" name="reset_password_mail_subject">
- <value>Openmeetings系统重置密码</value>
+ <value>$APP_NAME系统重置密码</value>
</string>
<string id="518" name="dateRegExpError">
<value>请输入一个有效的日期, 比如 24.12.2001 (天.月.年)</value>
@@ -1600,7 +1600,7 @@
<value>到:</value>
</string>
<string id="532" name="invitation_window_MailSubject">
- <value>邀请参加Openmeetings的讨论</value>
+ <value>邀请参加$APP_NAME的讨论</value>
</string>
<string id="533" name="invitation_error">
<value>没有此邀请码对应的有效邀请</value>
@@ -1870,7 +1870,7 @@
<value>服务器时间</value>
</string>
<string id="622" name="inv_reminder_template_head">
- <value>Openmeetings会议系统――提醒</value>
+ <value>$APP_NAME会议系统――提醒</value>
</string>
<string id="623" name="inv_reminder_text_from">
<value>用户信息：</value>
@@ -2860,7 +2860,7 @@
<value>需要您自己的服务器?</value>
</string>
<string id="952" name="user-license">
- <value>您如果想拥有自己的Openmeetings会议服务器或者集成到已有的应用中
去，5000元每次!</value>
+ <value>您如果想拥有自己的$APP_NAME会议服务器或者集成到已有的应用中
去，5000元每次!</value>
</string>
<string id="953" name="user-license">
<value>或者给我们发送信息</value>
@@ -2956,7 +2956,7 @@
<value>点击购买</value>
</string>
<string id="984" name="payment-from">
- <value>步骤3: Openmeetings系统支付 - 检查订单及付款!</value>
+ <value>步骤3: $APP_NAME系统支付 - 检查订单及付款!</value>
</string>
<string id="985" name="payment-from">
<value>姓名</value>
@@ -2971,10 +2971,10 @@
<value>已经收到您的付款，并已经更新了您的用户设置。所有以往的付款信息都
能够在您的用户配置中下载</value>
</string>
<string id="989" name="payment-mail">
- <value>感谢您使用Openmeetings系统!</value>
+ <value>感谢您使用$APP_NAME系统!</value>
</string>
<string id="990" name="payment-mail">
- <value>Openmeetings系统已经收到您的付款-</value>
+ <value>$APP_NAME系统已经收到您的付款-</value>
</string>
<string id="991" name="user-settings">
<value>支付状态</value>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Sat
Sep 17 08:15:38 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Mon
Sep 26 09:24:15 2011
@@ -67,10 +67,6 @@
</handler>
</dataset>
- <method name="openMeetingsMenuItemHandler">
-
lz.Browser.loadURL("http://code.google.com/p/openmeetings/";, "Openmeetings
Homepage");
- </method>
-
<method name="myinit">
<![CDATA[
canvas.mediaerrortimeout = 30000;
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/main.lzx Sun Jun 19
01:03:45 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/main.lzx Mon Sep 26
09:24:15 2011
@@ -40,9 +40,6 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
- // Add Custom Items:
- //var item1 = cmenu.makeMenuItem('MedCast', new
LzDelegate(this,"openMeetingsMenuItemHandler"));
- //cmenu.addItem(item1);
</handler>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx Sun Jun 19
01:03:45 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/maindebug.lzx Mon Sep 26
09:24:15 2011
@@ -41,9 +41,6 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
- // Add Custom Items:
- //var item1 = cmenu.makeMenuItem('MedCast', new
LzDelegate(this,"openMeetingsMenuItemHandler"));
- //cmenu.addItem(item1);
</handler>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Sat Sep 17 08:43:10 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Mon Sep 26 09:24:15 2011
@@ -281,4 +281,13 @@
}
return new Long(-1);
}
-}
+
+ public String getAppName() {
+ String appName = Configurationmanagement.DEFAULT_APP_NAME;
+ Configuration application_name = getConfKey(3L,
"application.name");
+ if (application_name != null) {
+ appName = application_name.getConf_value();
+ }
+ return appName;
+ }
+}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Sat Sep 17 08:43:10 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Mon Sep 26 09:24:15 2011
@@ -19,7 +19,6 @@
import javax.persistence.criteria.Root;
import org.openmeetings.app.data.beans.basic.SearchResult;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
@@ -568,18 +567,9 @@
}
return flv;
}
-
- private String getAppName() {
- String appName = Configurationmanagement.DEFAULT_APP_NAME;
- Configuration application_name =
cfgManagement.getConfKey(3L, "application.name");
- if (application_name != null) {
- appName = application_name.getConf_value();
- }
- return appName;
- }
private Fieldlanguagesvalues performReplace(Fieldlanguagesvalues f) {
- String appName = getAppName();
+ String appName = cfgManagement.getAppName();
return performReplace(f, appName);
}
@@ -589,7 +579,7 @@
}
private <T extends Collection<Fieldlanguagesvalues>> T performReplace(T
flv) {
- String appName = getAppName();
+ String appName = cfgManagement.getAppName();
for (Fieldlanguagesvalues f : flv) {
performReplace(f, appName);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Wed Sep 14 13:02:59 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Mon Sep 26 09:24:15 2011
@@ -84,7 +84,7 @@
ServletContext context = getServletContext();
String loginURL =
ScopeApplicationAdapter.webAppRootPath;
- ctx.put("APPLICATION_NAME",
context.getServletContextName());
+ ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
if (hash == null) {
// No hash
Long default_lang_id = Long.valueOf(
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Mon Sep 26 09:24:15 2011
@@ -54,14 +54,7 @@
3L, "sip.enable");
// SIP_REALM
- Configuration application_name =
getConfigurationmanagement()
- .getConfKey(3L, "application.name");
- if (application_name == null) {
- ctx.put("APPLICATION_NAME", getServletContext()
- .getServletContextName());
- } else {
- ctx.put("APPLICATION_NAME",
application_name.getConf_value());
- }
+ ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
if (SIP_ENABLE == null ||
!SIP_ENABLE.getConf_value().equals("yes")) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Sep 24 01:51:11 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
Mon Sep 26 09:24:15 2011
@@ -13,6 +13,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.documents.InstallationDocumentHandler;
import org.openmeetings.app.installation.ImportInitvalues;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
@@ -23,12 +24,22 @@
import org.springframework.web.context.support.WebApplicationContextUtils;
public class Install extends VelocityViewServlet {
-
- /**
- *
- */
private static final long serialVersionUID = 3684381243236013771L;
+ private Configurationmanagement getConfigurationmanagement() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Configurationmanagement)
context.getBean("cfgManagement");
+ } catch (Exception err) {
+ log.error("[getConfigurationmanagement]", err);
+ }
+ return null;
+ }
+
private ImportInitvalues getImportInitvalues() {
try {
if (!ScopeApplicationAdapter.initComplete) {
@@ -60,13 +71,12 @@
try {
ctx.put("APP_ROOT",
ScopeApplicationAdapter.webAppRootKey);
- if (getImportInitvalues() == null) {
+ if (getImportInitvalues() == null || getConfigurationmanagement() ==
null) {
return
getVelocityView().getVelocityEngine().getTemplate(
"booting_install.vm");
}
- ctx.put("APPLICATION_NAME", getServletContext()
- .getServletContextName());
+ ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
String command =
httpServletRequest.getParameter("command");
String lang = httpServletRequest.getParameter("lang");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Mon Sep 26 09:24:15 2011
@@ -11,6 +11,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -73,6 +74,20 @@
}
return null;
}
+
+ private Configurationmanagement getConfigurationmanagement() {
+ try {
+ if (!ScopeApplicationAdapter.initComplete) {
+ return null;
+ }
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (Configurationmanagement)
context.getBean("cfgManagement");
+ } catch (Exception err) {
+ log.error("[getConfigurationmanagement]", err);
+ }
+ return null;
+ }
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
@@ -186,8 +201,7 @@
"Predefindes Viewer List
does not contain publicSID("
+ publicSID +
") !");
- ctx.put("APPLICATION_NAME", getServletContext()
- .getServletContextName());
+ ctx.put("APP_NAME",
getConfigurationmanagement().getAppName());
ctx.put("HOST",
InetAddress.getLocalHost().getHostAddress());
ctx.put("PORT", myPort);
ctx.put("HEIGHT", rsss.getStreamHeight());
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Mon Sep 26 09:24:15 2011
@@ -184,8 +184,7 @@
ctx.put("webAppRootKey", httpRootKey);
ctx.put("httpSharerURL", httpSharerURL);
- ctx.put("APPLICATION_NAME", getServletContext()
- .getServletContextName());
+ ctx.put("APP_NAME", getCfgManagement().getAppName());
ctx.put("SID", sid);
ctx.put("ROOM", room);
ctx.put("DOMAIN", domain);
=======================================
--- /trunk/singlewebapp/src/templates/install_step1_EN.vm Tue Jul 5
02:10:59 2011
+++ /trunk/singlewebapp/src/templates/install_step1_EN.vm Mon Sep 26
09:24:15 2011
@@ -128,7 +128,7 @@
}
</script>
-<h1>Openmeetings - Installation</h1>
+<h1>$APP_NAME - Installation</h1>
<form name="cmxform" id="form1" class="cmxform" method="post"
action="?command=step2">
=======================================
--- /trunk/singlewebapp/src/templates/install_step2_EN.vm Mon Sep 19
08:04:50 2011
+++ /trunk/singlewebapp/src/templates/install_step2_EN.vm Mon Sep 26
09:24:15 2011
@@ -7,7 +7,7 @@
<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1' />
</head>
<body>
-<H1>Openmeetings - Installation Complete!</h1>
+<H1>$APP_NAME - Installation Complete!</h1>
<h2><a href="/$APP_ROOT/">Enter the Application</a></h2>
<br/>
<br/>
=======================================
--- /trunk/singlewebapp/src/templates/install_welcome_EN.vm Mon Sep 19
07:50:26 2011
+++ /trunk/singlewebapp/src/templates/install_welcome_EN.vm Mon Sep 26
09:24:15 2011
@@ -8,7 +8,7 @@
<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1' />
</head>
<body>
-<h1>Openmeetings - Installation</h1>
+<h1>$APP_NAME - Installation</h1>
<p>Necessary steps which should have already been done:</p>
<ol>
<li>Install and configure a database
=======================================
--- /trunk/singlewebapp/src/templates/screencast_jrdesktop.vm Wed Sep 14
13:02:59 2011
+++ /trunk/singlewebapp/src/templates/screencast_jrdesktop.vm Mon Sep 26
09:24:15 2011
@@ -3,7 +3,7 @@
<jnlp spec="1.0+"
codebase="http://$rtmphostlocal:$red5httpport$webAppRootKeyscreen";>
<information>
<title>ScreenViewer Client Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/screencast_odsp_sharertemplate.vm Wed
Sep 14 13:02:59 2011
+++ /trunk/singlewebapp/src/templates/screencast_odsp_sharertemplate.vm Mon
Sep 26 09:24:15 2011
@@ -3,7 +3,7 @@
<jnlp spec="1.0+" codebase="$codebase">
<information>
<title>ScreenViewer Client Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/screencast_odsp_viewertemplate.vm Wed
Sep 14 13:02:59 2011
+++ /trunk/singlewebapp/src/templates/screencast_odsp_viewertemplate.vm Mon
Sep 26 09:24:15 2011
@@ -3,7 +3,7 @@
<jnlp spec="1.0+" codebase="$codebase">
<information>
<title>ScreenViewer Client Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/screencast_rtp.vm Wed Oct 14 08:14:22
2009
+++ /trunk/singlewebapp/src/templates/screencast_rtp.vm Mon Sep 26 09:24:15
2011
@@ -3,7 +3,7 @@
<jnlp spec="1.0+" codebase="http://$rtmphostlocal:$red5httpport/screen";>
<information>
<title>ScreenViewer Client Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/screencast_template.vm Wed Sep 14
13:02:59 2011
+++ /trunk/singlewebapp/src/templates/screencast_template.vm Mon Sep 26
09:24:15 2011
@@ -3,7 +3,7 @@
<jnlp spec="1.0+" codebase="$codebase">
<information>
<title>ScreenViewer Client Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/screenshare.vm Tue Apr 26 02:04:33
2011
+++ /trunk/singlewebapp/src/templates/screenshare.vm Mon Sep 26 09:24:15
2011
@@ -2,7 +2,7 @@
<jnlp spec='1.0+' codebase='$codebase'>
<information>
<title>Screen Sharing Application</title>
- <vendor>Openmeetings</vendor>
+ <vendor>$APP_NAME</vendor>
<homepage>http://code.google.com/p/openmeetings/</homepage>
<icon href="icon.jpg" />
<icon kind="splash" href="splashicon.jpg" />
=======================================
--- /trunk/singlewebapp/src/templates/sip_template.vm Sun Jul 31 05:20:43
2011
+++ /trunk/singlewebapp/src/templates/sip_template.vm Mon Sep 26 09:24:15
2011
@@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<meta name="viewport" content="width=device-width; initial-scale=1.0;">
-<title>$APPLICATION_NAME</title>
+<title>$APP_NAME</title>
<script type="text/javascript">
// If loaded bare into a browser, set the browser size to the canvas size
if (window === top) {
=======================================
--- /trunk/singlewebapp/src/templates/usual_template.vm Sun Jul 31 05:20:43
2011
+++ /trunk/singlewebapp/src/templates/usual_template.vm Mon Sep 26 09:24:15
2011
@@ -8,7 +8,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<meta name="viewport" content="width=device-width; initial-scale=1.0;">
-<title>$APPLICATION_NAME</title>
+<title>$APP_NAME</title>
<script type="text/javascript">
// If loaded bare into a browser, set the browser size to the canvas size
if (window === top) {
--
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.
