Revision: 4121
Author: solomax666
Date: Sun Aug 28 05:21:09 2011
Log: - velocity libs are updated to the latest versions
- DefaultIndex servlet is changed to be DefaultIndexFilter bean
http://code.google.com/p/openmeetings/source/detail?r=4121
Added:
/branches/dev/injection/WebContent/sipindex.html
/branches/dev/injection/lib/velocity/velocity-1.6.2.jar
/branches/dev/injection/lib/velocity/velocity-tools-view-2.0.jar
/branches/dev/injection/src/app/org/openmeetings/filter
/branches/dev/injection/src/app/org/openmeetings/filter/outputhandler
/branches/dev/injection/src/app/org/openmeetings/filter/outputhandler/DefaultIndexFilter.java
Deleted:
/branches/dev/injection/WebContent/index.jsp
/branches/dev/injection/lib/velocity/jaxen-1.1.1.jar
/branches/dev/injection/lib/velocity/velocity-1.6-dev.jar
/branches/dev/injection/lib/velocity/velocity-tools-view-1.3.jar
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Modified:
/branches/dev/injection/.classpath
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
/branches/dev/injection/WebContent/WEB-INF/web.xml
/branches/dev/injection/build.xml
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
=======================================
--- /dev/null
+++ /branches/dev/injection/WebContent/sipindex.html Sun Aug 28 05:21:09
2011
@@ -0,0 +1,4 @@
+<!--
+ designed to be empty
+ necessary for tomcat process to default-index-page
+-->
=======================================
--- /dev/null
+++ /branches/dev/injection/lib/velocity/velocity-1.6.2.jar Sun Aug 28
05:21:09 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++ /branches/dev/injection/lib/velocity/velocity-tools-view-2.0.jar Sun
Aug 28 05:21:09 2011
Binary file, no diff available.
=======================================
--- /dev/null
+++
/branches/dev/injection/src/app/org/openmeetings/filter/outputhandler/DefaultIndexFilter.java
Sun Aug 28 05:21:09 2011
@@ -0,0 +1,160 @@
+package org.openmeetings.filter.outputhandler;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.velocity.context.Context;
+import org.apache.velocity.tools.view.VelocityViewFilter;
+import org.openmeetings.app.data.basic.Configurationmanagement;
+import org.openmeetings.app.persistence.beans.basic.Configuration;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class DefaultIndexFilter extends VelocityViewFilter {
+ private static final Logger log =
Red5LoggerFactory.getLogger(DefaultIndexFilter.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ @Autowired
+ private Configurationmanagement cfgManagement;
+
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse,
+ FilterChain arg2) throws IOException, ServletException {
+ try {
+ Context ctx = createContext((HttpServletRequest)servletRequest,
(HttpServletResponse)servletResponse);
+ String template = "sip_template.vm";
+
+ //Enable SIP Template or not
+ Configuration SIP_ENABLE = cfgManagement.getConfKey(3L,
"sip.enable");
+
+ //SIP_REALM
+ Configuration application_name =
cfgManagement.getConfKey(3L, "application.name");
+ if (application_name == null) {
+ ctx.put("APPLICATION_NAME",
getFilterConfig().getServletContext().getServletContextName());
+ } else {
+ ctx.put("APPLICATION_NAME",
application_name.getConf_value());
+ }
+
+ if (SIP_ENABLE == null ||
!SIP_ENABLE.getConf_value().equals("yes")) {
+
+ template = "usual_template.vm";
+
+ } else {
+
+ //Set all the Params for the Applet
Configuration
+
+ //SIP_REALM
+ Configuration SIP_REALM = cfgManagement.getConfKey(3L,
"sip.realm");
+ if (SIP_REALM == null) {
+ ctx.put("SIP_REALM", "");
+ } else {
+ ctx.put("SIP_REALM",
SIP_REALM.getConf_value());
+ }
+
+ //SIP_PORT
+ Configuration SIP_PORT = cfgManagement.getConfKey(3L,
"sip.port");
+ if (SIP_PORT == null) {
+ ctx.put("SIP_PORT", "");
+ } else {
+ ctx.put("SIP_PORT",
SIP_PORT.getConf_value());
+ }
+
+ //SIP_PROXYNAME
+ Configuration SIP_PROXYNAME =
cfgManagement.getConfKey(3L, "sip.proxyname");
+ if (SIP_PROXYNAME == null) {
+ ctx.put("SIP_PROXYNAME", "");
+ } else {
+ ctx.put("SIP_PROXYNAME",
SIP_PROXYNAME.getConf_value());
+ }
+
+ //SIP_TUNNEL
+ Configuration SIP_TUNNEL = cfgManagement.getConfKey(3L,
"sip.tunnel");
+ if (SIP_TUNNEL == null) {
+ ctx.put("SIP_TUNNEL", "");
+ } else {
+ ctx.put("SIP_TUNNEL",
SIP_TUNNEL.getConf_value());
+ }
+
+ //SIP_CODEBASE
+ Configuration SIP_CODEBASE =
cfgManagement.getConfKey(3L, "sip.codebase");
+ if (SIP_CODEBASE == null) {
+ ctx.put("SIP_CODEBASE", "");
+ } else {
+ ctx.put("SIP_CODEBASE",
SIP_CODEBASE.getConf_value());
+ }
+
+ //SIP_FORCETUNNEL
+ Configuration SIP_FORCETUNNEL =
cfgManagement.getConfKey(3L, "sip.forcetunnel");
+ if (SIP_FORCETUNNEL == null) {
+ ctx.put("SIP_FORCETUNNEL", "");
+ } else {
+ ctx.put("SIP_FORCETUNNEL",
SIP_FORCETUNNEL.getConf_value());
+ }
+ }
+
+ //Parse the Param for the SWF URL
+ String swf = servletRequest.getParameter("swf");
+ if (swf == null) {
+ ctx.put("SWF_URL", "main.swf8.swf");
+ } else {
+ ctx.put("SWF_URL", swf);
+ }
+
+ String SWF_PARAMS = "";
+ String SWF_FLASHVARS = "";
+
+ //Load params from URL and set into wrapper code
+ if (servletRequest.getParameterMap() != null) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<String> iter =
servletRequest.getParameterMap().keySet().iterator();iter.hasNext();) {
+ String paramKey = iter.next();
+ SWF_FLASHVARS +=
paramKey+"="+servletRequest.getParameterMap().get(paramKey)+"&";
+ SWF_PARAMS +=
paramKey+"="+servletRequest.getParameterMap().get(paramKey)+"&";
+ }
+ }
+
+ HashMap<String,String> defaultValuesMap = new
HashMap<String,String>();
+
+ defaultValuesMap.put("lzt","swf");
+ defaultValuesMap.put("lzproxied","solo");
+ defaultValuesMap.put("lzr","swf8");
+ defaultValuesMap.put("bgcolor","%23ffffff");
+ defaultValuesMap.put("width","100%25");
+ defaultValuesMap.put("height","100%25");
+
//defaultValuesMap.put("__lzurl","main.lzx%3Flzt%3Dswf%26lzproxied%3Dsolo%26lzr%3Dswf8");
+ defaultValuesMap.put("__lzminimumversion","8");
+ defaultValuesMap.put("id","lzapp");
+
+ for (Iterator<String> iter =
defaultValuesMap.keySet().iterator();iter.hasNext();) {
+ String paramKey = iter.next();
+ SWF_PARAMS +=
paramKey+"="+defaultValuesMap.get(paramKey);
+ SWF_FLASHVARS +=
paramKey+"="+defaultValuesMap.get(paramKey);
+ if (iter.hasNext()) {
+ SWF_PARAMS += "&";
+ SWF_FLASHVARS += "&";
+ }
+ }
+
+ ctx.put("SWF_PARAMS", SWF_PARAMS);
+ ctx.put("SWF_FLASHVARS", SWF_FLASHVARS);
+
+ getVelocityView().getVelocityEngine().getTemplate(template).merge(ctx,
servletResponse.getWriter());
+ //return
getVelocityView().getVelocityEngine().getTemplate(template);
+ return;
+
+ } catch (Exception er) {
+ System.out.println("Error downloading: " + er);
+ er.printStackTrace();
+ log.error("[Calendar :: service]",er);
+ }
+ }
+}
=======================================
--- /branches/dev/injection/WebContent/index.jsp Mon Oct 12 06:05:03 2009
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
-<html>
-<head>
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<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>OpenLaszlo Application</title>
-<script type="text/javascript">
- // If loaded bare into a browser, set the browser size to the
canvas size
- if (window === top) {
- (function (width, height) {
- // Cf. http://www.quirksmode.org/viewport/compatibility.html
- if (window.innerHeight) {
- // Sadly, innerHeight/Width is not r/w on some browsers,
and resizeTo is for outerHeight/Width
- window.resizeTo(width ? (width + window.outerWidth -
window.innerWidth) : window.outerWidth,
- height ? (height + window.outerHeight -
window.innerHeight) : window.outerHeight);
- } else if (document.documentElement &&
document.documentElement.clientHeight) {
- if (width) {
- document.documentElement.clientWidth = width;
- }
- if (height) {
- document.documentElement.clientHeight = height;
- }
- } else {
- if (width) {
- document.body.clientWidth = width;
- }
- if (height) {
- document.body.clientHeight = height;
- }
- }
- })(null, null);
- }
- </script>
-<script type="text/javascript"
- src="embed-compressed.js"></script>
-<script type="text/javascript">
-
-function getBrowserInfo() {
- //alert(navigator.userAgent);
- return navigator.userAgent;
-}
-
-</script>
-<style type="text/css">
-html,body { /* http://www.quirksmode.org/css/100percheight.html */
- height: 100%;
- /* prevent scrollbars */
- margin: 0;
- padding: 0;
- border: 0 none;
- overflow: hidden;
-}
-
-body {
- background-color: #ffffff;
-}
-
-img {
- border: 0 none;
-}
-</style>
-</head>
-<body>
-<script type="text/javascript">
- lz.embed.swf({url: 'maindebug.lzx.swf8.swf', allowfullscreen: 'true',
bgcolor: '#ffffff', width: '100%', height: '100%', id: 'lzapp',
accessible: 'false'});
-
- lz.embed.lzapp.onloadstatus = function loadstatus(p) {
- // called with a percentage (0-100) indicating load progress
- }
-
- lz.embed.lzapp.onload = function loaded() {
- // called when this application is done loading
- }
-</script>
-<div style="width: 100%; height: 100%;" id="lzappContainer"><embed
- src="maindebug.lzx-Dateien/maindebug.lzx" quality="high"
- bgcolor="#ffffff" wmode="window" allowfullscreen="false" id="lzapp"
- name="lzapp"
-
flashvars="lzt=swf&lzproxied=solo&lzr=swf8&bgcolor=%23ffffff&width=100%25&height=100%25&__lzurl=maindebug.lzx%3Flzt%3Dswf%26lzproxied%3Dsolo%26lzr%3Dswf8&__lzminimumversion=8&id=lzapp"
- swliveconnect="true" allowscriptaccess="sameDomain"
- type="application/x-shockwave-flash"
- pluginspage="http://www.macromedia.com/go/getflashplayer";
- align="middle" height="100%" width="100%"></div>
-<noscript>Please enable JavaScript in order to use this
-application.</noscript>
-</body>
-</html>
=======================================
--- /branches/dev/injection/lib/velocity/jaxen-1.1.1.jar Mon Oct 26
13:44:14 2009
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/dev/injection/lib/velocity/velocity-1.6-dev.jar Mon Oct 26
13:44:14 2009
+++ /dev/null
Binary file, no diff available.
=======================================
--- /branches/dev/injection/lib/velocity/velocity-tools-view-1.3.jar Mon
Oct 26 13:44:14 2009
+++ /dev/null
Binary file, no diff available.
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Sun Aug 28 02:16:36 2011
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.openmeetings.servlet.outputhandler;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
-import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.persistence.beans.basic.Configuration;
-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 DefaultIndex extends VelocityViewServlet {
- private static final long serialVersionUID = 3043617619650666432L;
- private static final Logger log = Red5LoggerFactory.getLogger(
- DefaultIndex.class,
ScopeApplicationAdapter.webAppRootKey);
-
- // // private Configurationmanagement cfgManagement;
- //
- // @Override
- // public void init(ServletConfig config) throws ServletException {
- // super.init(config);
- // // cfgManagement = (Configurationmanagement)
config.getServletContext()
- // // .getAttribute("getConfigurationmanagement()");
- // // log.error("in init: cfgManagement is null ? " + (null ==
- // // cfgManagement)
- // // + " ; " + cfgManagement);
- // }
-
- private Configurationmanagement getConfigurationmanagement() {
- try {
- 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,
- HttpServletResponse httpServletResponse, Context ctx)
- throws ServletException, IOException {
-
- try {
-
- if (getConfigurationmanagement() == null) {
- return
getVelocityEngine().getTemplate("booting.vm");
- }
-
- String template = "sip_template.vm";
-
- // Enable SIP Template or not
- Configuration SIP_ENABLE =
getConfigurationmanagement().getConfKey(
- 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());
- }
-
- if (SIP_ENABLE == null ||
!SIP_ENABLE.getConf_value().equals("yes")) {
-
- template = "usual_template.vm";
-
- } else {
-
- // Set all the Params for the Applet
Configuration
-
- // SIP_REALM
- Configuration SIP_REALM =
getConfigurationmanagement()
- .getConfKey(3L, "sip.realm");
- if (SIP_REALM == null) {
- ctx.put("SIP_REALM", "");
- } else {
- ctx.put("SIP_REALM",
SIP_REALM.getConf_value());
- }
-
- // SIP_PORT
- Configuration SIP_PORT =
getConfigurationmanagement()
- .getConfKey(3L, "sip.port");
- if (SIP_PORT == null) {
- ctx.put("SIP_PORT", "");
- } else {
- ctx.put("SIP_PORT",
SIP_PORT.getConf_value());
- }
-
- // SIP_PROXYNAME
- Configuration SIP_PROXYNAME =
getConfigurationmanagement()
- .getConfKey(3L,
"sip.proxyname");
- if (SIP_PROXYNAME == null) {
- ctx.put("SIP_PROXYNAME", "");
- } else {
- ctx.put("SIP_PROXYNAME",
SIP_PROXYNAME.getConf_value());
- }
-
- // SIP_TUNNEL
- Configuration SIP_TUNNEL =
getConfigurationmanagement()
- .getConfKey(3L, "sip.tunnel");
- if (SIP_TUNNEL == null) {
- ctx.put("SIP_TUNNEL", "");
- } else {
- ctx.put("SIP_TUNNEL",
SIP_TUNNEL.getConf_value());
- }
-
- // SIP_CODEBASE
- Configuration SIP_CODEBASE =
getConfigurationmanagement()
- .getConfKey(3L, "sip.codebase");
- if (SIP_CODEBASE == null) {
- ctx.put("SIP_CODEBASE", "");
- } else {
- ctx.put("SIP_CODEBASE",
SIP_CODEBASE.getConf_value());
- }
-
- // SIP_FORCETUNNEL
- Configuration SIP_FORCETUNNEL =
getConfigurationmanagement()
- .getConfKey(3L,
"sip.forcetunnel");
- if (SIP_FORCETUNNEL == null) {
- ctx.put("SIP_FORCETUNNEL", "");
- } else {
- ctx.put("SIP_FORCETUNNEL",
SIP_FORCETUNNEL.getConf_value());
- }
- }
-
- // Parse the Param for the SWF URL
- String swf = httpServletRequest.getParameter("swf");
- if (swf == null) {
- ctx.put("SWF_URL", "main.swf8.swf");
- } else {
- ctx.put("SWF_URL", swf);
- }
-
- String SWF_PARAMS = "";
- String SWF_FLASHVARS = "";
-
- // Load params from URL and set into wrapper code
- if (httpServletRequest.getParameterMap() != null) {
- for (Iterator<String> iter = httpServletRequest
-
.getParameterMap().keySet().iterator(); iter.hasNext();) {
- String paramKey = iter.next();
- SWF_FLASHVARS += paramKey
- + "="
- +
httpServletRequest.getParameterMap()
- .get(paramKey) +
"&";
- SWF_PARAMS += paramKey
- + "="
- +
httpServletRequest.getParameterMap()
- .get(paramKey) +
"&";
- }
- }
-
- HashMap<String, String> defaultValuesMap = new HashMap<String,
String>();
-
- defaultValuesMap.put("lzt", "swf");
- defaultValuesMap.put("lzproxied", "solo");
- defaultValuesMap.put("lzr", "swf8");
- defaultValuesMap.put("bgcolor", "%23ffffff");
- defaultValuesMap.put("width", "100%25");
- defaultValuesMap.put("height", "100%25");
- //
defaultValuesMap.put("__lzurl","main.lzx%3Flzt%3Dswf%26lzproxied%3Dsolo%26lzr%3Dswf8");
- defaultValuesMap.put("__lzminimumversion", "8");
- defaultValuesMap.put("id", "lzapp");
-
- for (Iterator<String> iter =
defaultValuesMap.keySet().iterator(); iter
- .hasNext();) {
- String paramKey = iter.next();
- SWF_PARAMS += paramKey + "=" +
defaultValuesMap.get(paramKey);
- SWF_FLASHVARS += paramKey + "="
- +
defaultValuesMap.get(paramKey);
- if (iter.hasNext()) {
- SWF_PARAMS += "&";
- SWF_FLASHVARS += "&";
- }
- }
-
- ctx.put("SWF_PARAMS", SWF_PARAMS);
- ctx.put("SWF_FLASHVARS", SWF_FLASHVARS);
-
- return getVelocityEngine().getTemplate(template);
-
- } catch (Exception er) {
- System.out.println("Error downloading: " + er);
- er.printStackTrace();
- log.error("[Calendar :: service]", er);
- }
- return null;
- }
-}
=======================================
--- /branches/dev/injection/.classpath Sat Aug 20 11:35:15 2011
+++ /branches/dev/injection/.classpath Sun Aug 28 05:21:09 2011
@@ -13,6 +13,8 @@
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="lib" path="WebContent/screen/kunststoff.jar"/>
<classpathentry kind="lib"
path="lib/spring/org.springframework.test-3.0.5.RELEASE.jar"/>
+ <classpathentry kind="lib" path="lib/velocity/velocity-1.6.2.jar"/>
+ <classpathentry kind="lib"
path="lib/velocity/velocity-tools-view-2.0.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="server/red5/lib/javaee-api-5.1.1.jar"/>
@@ -86,9 +88,6 @@
<classpathentry kind="lib" path="lib/upload/ws-commons-util-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/upload/xmlrpc-client-3.1.2.jar"/>
<classpathentry kind="lib" path="lib/upload/xmlrpc-common-3.1.2.jar"/>
- <classpathentry kind="lib" path="lib/velocity/jaxen-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/velocity/velocity-1.6-dev.jar"/>
- <classpathentry kind="lib"
path="lib/velocity/velocity-tools-view-1.3.jar"/>
<classpathentry kind="lib" path="server/red5/red5.jar"/>
<classpathentry kind="lib"
path="server/red5/lib/mina-core-2.0.0-RC2-SNAPSHOT.jar"/>
<classpathentry kind="lib"
path="server/red5/lib/mina-integration-beans-2.0.0-RC2-SNAPSHOT.jar"/>
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 28 01:56:14 2011
+++
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 28 05:21:09 2011
@@ -7,6 +7,11 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd";
>
+
+ <!-- filters -->
+ <bean id="defaultIndexFilter"
class="org.openmeetings.filter.outputhandler.DefaultIndexFilter" />
+
+ <!-- beans -->
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
<property name="persistenceUnitName" value="openmeetings" />
</bean>
=======================================
--- /branches/dev/injection/WebContent/WEB-INF/web.xml Sun Aug 14 12:12:21
2011
+++ /branches/dev/injection/WebContent/WEB-INF/web.xml Sun Aug 28 05:21:09
2011
@@ -9,9 +9,6 @@
<welcome-file-list>
<welcome-file>sipindex.html</welcome-file>
- <welcome-file>login.html</welcome-file>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
</welcome-file-list>
<!-- Custom logging like described in Paul Gregoire Patch:
@@ -48,19 +45,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!--
- <filter>
- <filter-name>LoggerContextFilter</filter-name>
- <filter-class>org.red5.logging.LoggerContextFilter</filter-class>
- </filter>
-
-
- <filter-mapping>
- <filter-name>LoggerContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- -->
-
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/red5-*.xml</param-value>
@@ -73,27 +57,10 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
- <!-- This will only work for Red5-0.6.3 !!
- in 0.7 this throws an Error and the App will not start
- <context-param>
- <param-name>log4jConfigLocation</param-name>
- <param-value>/WEB-INF/log4j.properties</param-value>
- </context-param>
- -->
-
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>/openmeetings</param-value>
</context-param>
-
- <!--
- <listener>
-
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
- </listener>
- <listener>
-
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
- -->
<!-- remove the following servlet tags if you want to disable remoting
for this application -->
<servlet>
<servlet-name>gateway</servlet-name>
@@ -179,12 +146,14 @@
<servlet-name>MethodGateway</servlet-name>
<servlet-class>org.openmeetings.servlet.outputhandler.MethodGateway</servlet-class>
</servlet>
- <servlet>
- <description>DefaultIndex</description>
- <display-name>DefaultIndex</display-name>
- <servlet-name>DefaultIndex</servlet-name>
-
<servlet-class>org.openmeetings.servlet.outputhandler.DefaultIndex</servlet-class>
- </servlet>
+ <filter>
+ <filter-name>defaultIndexFilter</filter-name>
+
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ <init-param>
+ <param-name>targetFilterLifecycle</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ </filter>
<servlet>
<description>BackupExport</description>
<display-name>BackupExport</display-name>
@@ -286,10 +255,10 @@
<servlet-name>MethodGateway</servlet-name>
<url-pattern>/MethodGateway</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>DefaultIndex</servlet-name>
- <url-pattern>/sipindex.html</url-pattern>
- </servlet-mapping>
+ <filter-mapping>
+ <filter-name>defaultIndexFilter</filter-name>
+ <url-pattern>/sipindex.html</url-pattern>
+ </filter-mapping>
<servlet-mapping>
<servlet-name>BackupExport</servlet-name>
<url-pattern>/BackupExport</url-pattern>
=======================================
--- /branches/dev/injection/build.xml Sat Aug 27 07:16:44 2011
+++ /branches/dev/injection/build.xml Sun Aug 28 05:21:09 2011
@@ -166,6 +166,11 @@
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/red5-services">
<fileset dir="${webcontent.src.dir}/WEB-INF/red5-services"
includes="*.xml"/>
</copy>
+ <copy todir="${dist.dir}/red5/webapps/${project.distname}">
+ <fileset dir="${webcontent.src.dir}">
+ <include name="*.html"/>
+ </fileset>
+ </copy>
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF">
<fileset dir="${webcontent.src.dir}/WEB-INF">
<include name="*.xml"/>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sat Aug 13 22:42:00 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sun Aug 28 05:21:09 2011
@@ -40,8 +40,7 @@
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx)
- throws ServletException, IOException {
+ HttpServletResponse httpServletResponse, Context ctx) {
try {
String hash = httpServletRequest.getParameter("u");
@@ -63,7 +62,7 @@
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityEngine()
+ return getVelocityView().getVelocityEngine()
.getTemplate("activation_template.vm");
}
//
@@ -84,7 +83,7 @@
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityEngine()
+ return getVelocityView().getVelocityEngine()
.getTemplate("activation_template.vm");
} else if (user.getStatus() == 1) {
@@ -102,7 +101,7 @@
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityEngine()
+ return getVelocityView().getVelocityEngine()
.getTemplate("activation_template.vm");
} else if (user.getStatus() == 0) {
@@ -125,7 +124,7 @@
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityEngine()
+ return getVelocityView().getVelocityEngine()
.getTemplate("activation_template.vm");
} else {
@@ -141,7 +140,7 @@
ctx.put("link",
"<a href='" + loginURL + "'>" +
labelid672.getValue()
+ "</a>");
- return getVelocityEngine()
+ return getVelocityView().getVelocityEngine()
.getTemplate("activation_template.vm");
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 14 07:43:11 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 28 05:21:09 2011
@@ -52,8 +52,7 @@
*/
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx)
- throws ServletException, IOException {
+ HttpServletResponse httpServletResponse, Context ctx) {
try {
@@ -92,7 +91,7 @@
ctx.put("error",
"Could not Create
File, Permission set? ");
ctx.put("path", working_dir);
- return
getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_error_" + lang +
".vm");
} else {
InstallationDocumentHandler
@@ -103,7 +102,7 @@
0);
// File has been created so
follow first step of
// Installation
- return
getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_welcome_" + lang
+ ".vm");
}
@@ -150,7 +149,7 @@
return tpl;
} else {
- return
getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_step2_" + lang +
".vm");
}
}
@@ -208,7 +207,7 @@
} 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>");
- return getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_exception_" + lang +
".vm");
}
@@ -373,12 +372,12 @@
// return
//
getVelocityEngine().getTemplate("install_complete_"+lang+".vm");
- return getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_step2_" + lang +
".vm");
} 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>");
- return getVelocityEngine().getTemplate(
+ return
getVelocityView().getVelocityEngine().getTemplate(
"install_exception_" + lang +
".vm");
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Sat Aug 27 03:27:19 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Sun Aug 28 05:21:09 2011
@@ -48,8 +48,7 @@
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx) throws
ServletException,
- IOException {
+ HttpServletResponse httpServletResponse, Context ctx) {
try {
@@ -161,7 +160,7 @@
//rsss.addNewViewer(ip, port);
- return
getVelocityEngine().getTemplate(template);
+ return
getVelocityView().getVelocityEngine().getTemplate(template);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sat Aug 27 03:27:19 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sun Aug 28 05:21:09 2011
@@ -46,8 +46,7 @@
@Override
public Template handleRequest(HttpServletRequest httpServletRequest,
- HttpServletResponse httpServletResponse, Context ctx)
- throws ServletException, IOException {
+ HttpServletResponse httpServletResponse, Context ctx) {
try {
@@ -386,7 +385,7 @@
log.debug("template " + template);
- return getVelocityEngine().getTemplate(template);
+ return
getVelocityView().getVelocityEngine().getTemplate(template);
// }
--
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.
