Revision: 4126
Author: solomax666
Date: Sun Aug 28 09:53:59 2011
Log: - DefaultIndexFilter changes are reverted
- compilation warnings are corrected
http://code.google.com/p/openmeetings/source/detail?r=4126
Added:
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Deleted:
/branches/dev/injection/src/app/org/openmeetings/filter
Modified:
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
/branches/dev/injection/WebContent/WEB-INF/web.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/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
Sun Aug 28 09:53:59 2011
@@ -0,0 +1,188 @@
+package org.openmeetings.servlet.outputhandler;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+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.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 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) {
+
+ try {
+
+ if (getConfigurationmanagement() == null) {
+ return
getVelocityView().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
getVelocityView().getVelocityEngine().getTemplate(template);
+
+ } catch (Exception er) {
+ System.out.println("Error downloading: " + er);
+ er.printStackTrace();
+ log.error("[Calendar :: service]", er);
+ }
+ return null;
+ }
+}
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 28 05:21:09 2011
+++
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 28 09:53:59 2011
@@ -7,11 +7,6 @@
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 28 05:21:09
2011
+++ /branches/dev/injection/WebContent/WEB-INF/web.xml Sun Aug 28 09:53:59
2011
@@ -9,6 +9,9 @@
<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:
@@ -45,6 +48,19 @@
<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>
@@ -57,10 +73,27 @@
<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>
@@ -146,14 +179,12 @@
<servlet-name>MethodGateway</servlet-name>
<servlet-class>org.openmeetings.servlet.outputhandler.MethodGateway</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>DefaultIndex</description>
+ <display-name>DefaultIndex</display-name>
+ <servlet-name>DefaultIndex</servlet-name>
+
<servlet-class>org.openmeetings.servlet.outputhandler.DefaultIndex</servlet-class>
+ </servlet>
<servlet>
<description>BackupExport</description>
<display-name>BackupExport</display-name>
@@ -255,10 +286,10 @@
<servlet-name>MethodGateway</servlet-name>
<url-pattern>/MethodGateway</url-pattern>
</servlet-mapping>
- <filter-mapping>
- <filter-name>defaultIndexFilter</filter-name>
- <url-pattern>/sipindex.html</url-pattern>
- </filter-mapping>
+ <servlet-mapping>
+ <servlet-name>DefaultIndex</servlet-name>
+ <url-pattern>/sipindex.html</url-pattern>
+ </servlet-mapping>
<servlet-mapping>
<servlet-name>BackupExport</servlet-name>
<url-pattern>/BackupExport</url-pattern>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sun Aug 28 05:21:09 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
Sun Aug 28 09:53:59 2011
@@ -1,6 +1,5 @@
package org.openmeetings.servlet.outputhandler;
-import java.io.IOException;
import java.util.Date;
import javax.servlet.ServletConfig;
@@ -11,7 +10,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
+import org.apache.velocity.tools.view.VelocityViewServlet;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.user.Usermanagement;
@@ -20,7 +19,6 @@
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 ActivateUser extends VelocityViewServlet {
private static final long serialVersionUID = -8892729047921796170L;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 28 05:21:09 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 28 09:53:59 2011
@@ -14,7 +14,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
+import org.apache.velocity.tools.view.VelocityViewServlet;
import org.openmeetings.app.documents.InstallationDocumentHandler;
import org.openmeetings.app.installation.ImportInitvalues;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Sun Aug 28 05:21:09 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
Sun Aug 28 09:53:59 2011
@@ -1,6 +1,5 @@
package org.openmeetings.servlet.outputhandler;
-import java.io.IOException;
import java.net.InetAddress;
import java.util.Date;
import java.util.HashMap;
@@ -13,7 +12,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
+import org.apache.velocity.tools.view.VelocityViewServlet;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sun Aug 28 05:21:09 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
Sun Aug 28 09:53:59 2011
@@ -1,7 +1,5 @@
package org.openmeetings.servlet.outputhandler;
-import java.io.IOException;
-
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -10,7 +8,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
+import org.apache.velocity.tools.view.VelocityViewServlet;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.basic.Sessionmanagement;
--
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.
