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 2012/02/09 16:26:41 UTC
svn commit: r1242358 [3/4] - in
/incubator/openmeetings/trunk/singlewebapp/src:
app/org/openmeetings/app/conference/whiteboard/
app/org/openmeetings/app/data/basic/ app/org/openmeetings/app/data/basic/dao/
app/org/openmeetings/app/data/calendar/daos/ a...
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGXmlWriterFactory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGXmlWriterFactory.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGXmlWriterFactory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGXmlWriterFactory.java Thu Feb 9 15:26:35 2012
@@ -27,7 +27,7 @@ import org.apache.ws.commons.serialize.X
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.common.XmlRpcStreamConfig;
import org.apache.xmlrpc.serializer.XmlWriterFactory;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.xml.sax.ContentHandler;
@@ -36,7 +36,7 @@ import org.xml.sax.ContentHandler;
public class OpenXGXmlWriterFactory implements XmlWriterFactory {
- private static final Logger log = Red5LoggerFactory.getLogger(OpenXGXmlWriterFactory.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(OpenXGXmlWriterFactory.class, OpenmeetingsVariables.webAppRootKey);
protected XMLWriter newXmlWriter() {
return new OpenXgXmlWriter();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXgXmlWriter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXgXmlWriter.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXgXmlWriter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXgXmlWriter.java Thu Feb 9 15:26:35 2012
@@ -29,7 +29,7 @@ import java.util.Map;
import javax.xml.XMLConstants;
import org.apache.ws.commons.serialize.XMLWriter;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.xml.sax.Attributes;
@@ -38,7 +38,7 @@ import org.xml.sax.SAXException;
public class OpenXgXmlWriter implements XMLWriter {
- private static final Logger log = Red5LoggerFactory.getLogger(OpenXgXmlWriter.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(OpenXgXmlWriter.class, OpenmeetingsVariables.webAppRootKey);
private static final int STATE_OUTSIDE = 0;
private static final int STATE_IN_START_ELEMENT = 1;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/FeedbackTemplate.java Thu Feb 9 15:26:35 2012
@@ -22,6 +22,7 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -31,7 +32,7 @@ public class FeedbackTemplate extends Ve
private static final String tamplateName = "feedback.vm";
private static final Logger log = Red5LoggerFactory.getLogger(
- FeedbackTemplate.class, ScopeApplicationAdapter.webAppRootKey);
+ FeedbackTemplate.class, OpenmeetingsVariables.webAppRootKey);
public String getFeedBackTemplate(String username, String email,
String message, Integer default_lang_id) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/InvitationTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/InvitationTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/InvitationTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/InvitationTemplate.java Thu Feb 9 15:26:35 2012
@@ -23,9 +23,9 @@ import java.util.Date;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@ public class InvitationTemplate extends
private Fieldmanagment fieldmanagment;
private static final Logger log = Red5LoggerFactory.getLogger(
- InvitationTemplate.class, ScopeApplicationAdapter.webAppRootKey);
+ InvitationTemplate.class, OpenmeetingsVariables.webAppRootKey);
public String getRegisterInvitationTemplate(String user, String message,
String invitation_link, Long default_lang_id, Date dStart, Date dEnd) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java Thu Feb 9 15:26:35 2012
@@ -22,9 +22,9 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@ public class RegisterUserTemplate extend
private static final String templateNameVerification = "register_verification_mail.vm";
private static final Logger log = Red5LoggerFactory.getLogger(
- RegisterUserTemplate.class, ScopeApplicationAdapter.webAppRootKey);
+ RegisterUserTemplate.class, OpenmeetingsVariables.webAppRootKey);
public String getRegisterUserWithVerificationTemplate(String username,
String userpass, String email, Long default_lang_id,
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactConfirmTemplate.java Thu Feb 9 15:26:35 2012
@@ -22,7 +22,7 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -32,7 +32,7 @@ public class RequestContactConfirmTempla
private static final Logger log = Red5LoggerFactory.getLogger(
RequestContactConfirmTemplate.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
public String getRequestContactTemplate(String message) {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/RequestContactTemplate.java Thu Feb 9 15:26:35 2012
@@ -22,7 +22,7 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -32,7 +32,7 @@ public class RequestContactTemplate exte
private static final Logger log = Red5LoggerFactory
.getLogger(RequestContactTemplate.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
public String getRequestContactTemplate(String message, String accept_link,
String deny_link, String openmeetings_link) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/ResetPasswordTemplate.java Thu Feb 9 15:26:35 2012
@@ -22,9 +22,9 @@ import java.io.StringWriter;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +37,7 @@ public class ResetPasswordTemplate exten
private static final String tamplateName = "resetPass.vm";
private static final Logger log = Red5LoggerFactory.getLogger(
- FeedbackTemplate.class, ScopeApplicationAdapter.webAppRootKey);
+ FeedbackTemplate.class, OpenmeetingsVariables.webAppRootKey);
public String getResetPasswordTemplate(String reset_link,
Long default_lang_id) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/VelocityLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/VelocityLoader.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/VelocityLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/templates/VelocityLoader.java Thu Feb 9 15:26:35 2012
@@ -21,6 +21,7 @@ package org.openmeetings.app.templates;
import java.io.File;
import org.apache.velocity.app.Velocity;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -34,7 +35,7 @@ import org.slf4j.Logger;
public abstract class VelocityLoader {
private static final Logger log = Red5LoggerFactory.getLogger(
- VelocityLoader.class, ScopeApplicationAdapter.webAppRootKey);
+ VelocityLoader.class, OpenmeetingsVariables.webAppRootKey);
public VelocityLoader() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/LanguageImport.java Thu Feb 9 15:26:35 2012
@@ -24,18 +24,18 @@ import java.util.Iterator;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
-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 LanguageImport {
private static final Logger log = Red5LoggerFactory.getLogger(
- LanguageImport.class, ScopeApplicationAdapter.webAppRootKey);
+ LanguageImport.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Fieldmanagment fieldmanagment;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java Thu Feb 9 15:26:35 2012
@@ -24,13 +24,13 @@ import java.util.Iterator;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.user.Emailmanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.Statemanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -39,7 +39,7 @@ import org.springframework.beans.factory
public class UserImport {
private static final Logger log = Red5LoggerFactory.getLogger(
- UserImport.class, ScopeApplicationAdapter.webAppRootKey);
+ UserImport.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Usermanagement userManagement;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ActivateUser.java Thu Feb 9 15:26:35 2012
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.user.Usermanagement;
@@ -40,7 +41,7 @@ import org.springframework.web.context.s
public class ActivateUser extends VelocityViewServlet {
private static final long serialVersionUID = -8892729047921796170L;
private static Logger log = Red5LoggerFactory.getLogger(ActivateUser.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
private Configurationmanagement getConfigurationmanagement() {
try {
@@ -98,7 +99,7 @@ public class ActivateUser extends Veloci
}
String hash = httpServletRequest.getParameter("u");
- String loginURL = ScopeApplicationAdapter.webAppRootPath;
+ String loginURL = OpenmeetingsVariables.webAppRootPath;
ctx.put("APP_NAME", getConfigurationmanagement().getAppName());
if (hash == null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java Thu Feb 9 15:26:35 2012
@@ -43,6 +43,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.basic.dao.LdapConfigDaoImpl;
@@ -77,7 +78,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.user.PrivateMessages;
import org.openmeetings.app.persistence.beans.user.UserContacts;
import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -91,7 +91,7 @@ import org.springframework.beans.factory
public class BackupExport {
private static final Logger log = Red5LoggerFactory.getLogger(
- BackupExport.class, ScopeApplicationAdapter.webAppRootKey);
+ BackupExport.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private AppointmentDaoImpl appointmentDao;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExportFacade.java Thu Feb 9 15:26:35 2012
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -42,7 +43,7 @@ public class BackupExportFacade extends
private static final long serialVersionUID = -928315730609302260L;
private static final Logger log = Red5LoggerFactory.getLogger(
- BackupExportFacade.class, ScopeApplicationAdapter.webAppRootKey);
+ BackupExportFacade.class, OpenmeetingsVariables.webAppRootKey);
private BackupExport getBackupExport() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java Thu Feb 9 15:26:35 2012
@@ -46,6 +46,7 @@ import org.apache.commons.lang.StringUti
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -100,7 +101,7 @@ import org.springframework.beans.factory
public class BackupImport {
private static final Logger log = Red5LoggerFactory.getLogger(
- BackupImport.class, ScopeApplicationAdapter.webAppRootKey);
+ BackupImport.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private AppointmentDaoImpl appointmentDao;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImportFacade.java Thu Feb 9 15:26:35 2012
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -37,7 +38,7 @@ public class BackupImportFacade extends
private static final long serialVersionUID = 2786696080712127872L;
private static final Logger log = Red5LoggerFactory.getLogger(
- BackupImportFacade.class, ScopeApplicationAdapter.webAppRootKey);
+ BackupImportFacade.class, OpenmeetingsVariables.webAppRootKey);
private BackupImport getBackupImport() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/CalendarServlet.java Thu Feb 9 15:26:35 2012
@@ -36,6 +36,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
@@ -53,7 +54,7 @@ import org.springframework.web.context.s
public class CalendarServlet extends HttpServlet {
private static final long serialVersionUID = 2192254610711799347L;
private static final Logger log = Red5LoggerFactory.getLogger(
- Calendar.class, ScopeApplicationAdapter.webAppRootKey);
+ Calendar.class, OpenmeetingsVariables.webAppRootKey);
public AppointmentLogic getAppointmentLogic() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DefaultIndex.java Thu Feb 9 15:26:35 2012
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -38,7 +39,7 @@ import org.springframework.web.context.s
public class DefaultIndex extends VelocityViewServlet {
private static final long serialVersionUID = 3043617619650666432L;
private static final Logger log = Red5LoggerFactory.getLogger(
- DefaultIndex.class, ScopeApplicationAdapter.webAppRootKey);
+ DefaultIndex.class, OpenmeetingsVariables.webAppRootKey);
private Configurationmanagement getConfigurationmanagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/DownloadHandler.java Thu Feb 9 15:26:35 2012
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -42,7 +43,7 @@ public class DownloadHandler extends Htt
private static final long serialVersionUID = 7243653203578587544L;
private static final Logger log = Red5LoggerFactory.getLogger(
- DownloadHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ DownloadHandler.class, OpenmeetingsVariables.webAppRootKey);
private static final String defaultImageName = "deleted.jpg";
private static final String defaultProfileImageName = "profile_pic.jpg";
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Export.java Thu Feb 9 15:26:35 2012
@@ -34,6 +34,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
@@ -57,7 +58,7 @@ import org.springframework.web.context.s
public class Export extends HttpServlet {
private static final long serialVersionUID = 8527093674786692472L;
private static final Logger log = Red5LoggerFactory.getLogger(Export.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ExportToImage.java Thu Feb 9 15:26:35 2012
@@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.dom.svg.SVGDOMImplementation;
import org.apache.batik.svggen.SVGGraphics2D;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.batik.beans.PrintBean;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.record.WhiteboardMapToSVG;
@@ -54,7 +55,7 @@ import org.w3c.dom.Element;
public class ExportToImage extends HttpServlet {
private static final long serialVersionUID = -3535998254746084297L;
private static final Logger log = Red5LoggerFactory.getLogger(
- ExportToImage.class, ScopeApplicationAdapter.webAppRootKey);
+ ExportToImage.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/FileExplorerUploadHandler.java Thu Feb 9 15:26:35 2012
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.file.FileProcessor;
import org.openmeetings.app.data.file.dao.FileExplorerItemDaoImpl;
@@ -41,7 +42,7 @@ public class FileExplorerUploadHandler e
private static final long serialVersionUID = 2848421357849982426L;
private static final Logger log = Red5LoggerFactory.getLogger(
FileExplorerUploadHandler.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
public FileExplorerItemDaoImpl getFileExplorerItemDao() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java Thu Feb 9 15:26:35 2012
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -46,7 +47,7 @@ import org.springframework.web.context.s
public class Import extends HttpServlet {
private static final long serialVersionUID = 582610358088411294L;
private static final Logger log = Red5LoggerFactory.getLogger(Import.class,
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Install.java Thu Feb 9 15:26:35 2012
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.documents.InstallationDocumentHandler;
import org.openmeetings.app.installation.ImportInitvalues;
@@ -72,7 +73,7 @@ public class Install extends VelocityVie
}
private static final Logger log = Red5LoggerFactory.getLogger(
- Install.class, ScopeApplicationAdapter.webAppRootKey);
+ Install.class, OpenmeetingsVariables.webAppRootKey);
private Template getStep2Template(HttpServletRequest httpServletRequest, Context ctx, String lang) throws Exception {
String header = httpServletRequest.getHeader("Accept-Language");
@@ -147,7 +148,7 @@ public class Install extends VelocityVie
HttpServletResponse httpServletResponse, Context ctx) {
try {
- ctx.put("APP_ROOT", ScopeApplicationAdapter.webAppRootKey);
+ ctx.put("APP_ROOT", OpenmeetingsVariables.webAppRootKey);
if (getImportInitvalues() == null || getConfigurationmanagement() == null) {
return getVelocityView().getVelocityEngine().getTemplate(
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/LangExport.java Thu Feb 9 15:26:35 2012
@@ -34,6 +34,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.FieldLanguageDaoImpl;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -55,7 +56,7 @@ import org.springframework.web.context.s
public class LangExport extends HttpServlet {
private static final long serialVersionUID = 243294279856160463L;
private static final Logger log = Red5LoggerFactory.getLogger(
- LangExport.class, ScopeApplicationAdapter.webAppRootKey);
+ LangExport.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java Thu Feb 9 15:26:35 2012
@@ -26,6 +26,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.conference.Roommanagement;
@@ -47,7 +48,7 @@ public class MethodGateway extends HttpS
private static final long serialVersionUID = -2954875038645746731L;
private static final Logger log = Red5LoggerFactory.getLogger(
- MethodGateway.class, ScopeApplicationAdapter.webAppRootKey);
+ MethodGateway.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPMethodServlet.java Thu Feb 9 15:26:35 2012
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.persistence.beans.recording.RoomClient;
import org.openmeetings.app.remote.red5.ClientListManager;
@@ -48,7 +49,7 @@ public class RTPMethodServlet extends Ht
private static final long serialVersionUID = 6781441755140201613L;
private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenRequestHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ ScreenRequestHandler.class, OpenmeetingsVariables.webAppRootKey);
public static final String METHOD_START = "streamer_start";
public static final String METHOD_STOP = "streamer_stop";
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/RTPSharerServlet.java Thu Feb 9 15:26:35 2012
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
@@ -51,7 +52,7 @@ import org.springframework.web.context.s
public class RTPSharerServlet extends VelocityViewServlet {
private static final long serialVersionUID = -3803050458625713769L;
private static final Logger log = Red5LoggerFactory.getLogger(
- RTPSharerServlet.class, ScopeApplicationAdapter.webAppRootKey);
+ RTPSharerServlet.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java Thu Feb 9 15:26:35 2012
@@ -25,6 +25,7 @@ import org.apache.commons.lang.StringUti
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.view.VelocityViewServlet;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -42,7 +43,7 @@ import org.springframework.web.context.s
public class ScreenRequestHandler extends VelocityViewServlet {
private static final long serialVersionUID = 2381722235536488913L;
private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenRequestHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ ScreenRequestHandler.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
@@ -398,8 +399,7 @@ public class ScreenRequestHandler extend
ctx.put("startUpClass", startUpClass);
ctx.put("codebase", codebase);
ctx.put("red5-host", rtmphostlocal);
- ctx.put("red5-app",
- ScopeApplicationAdapter.webAppRootKey + "/"
+ ctx.put("red5-app", OpenmeetingsVariables.webAppRootKey + "/"
+ room);
Configuration configuration = getCfgManagement()
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenServlet.java Thu Feb 9 15:26:35 2012
@@ -40,6 +40,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
@@ -67,7 +68,7 @@ import com.anotherbigidea.flash.readers.
public class ScreenServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenServlet.class, ScopeApplicationAdapter.webAppRootKey);
+ ScreenServlet.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenViewHandler.java Thu Feb 9 15:26:35 2012
@@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -40,7 +41,7 @@ import org.springframework.web.context.s
public class ScreenViewHandler extends HttpServlet {
private static final long serialVersionUID = -2221780306064491855L;
private static final Logger log = Red5LoggerFactory.getLogger(
- ScreenViewHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ ScreenViewHandler.class, OpenmeetingsVariables.webAppRootKey);
public Sessionmanagement getSessionManagement() {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/UploadHandler.java Thu Feb 9 15:26:35 2012
@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.user.Usermanagement;
@@ -58,7 +59,7 @@ public class UploadHandler extends HttpS
private static final long serialVersionUID = 8955335681521483484L;
private static final Logger log = Red5LoggerFactory.getLogger(
- UploadHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ UploadHandler.class, OpenmeetingsVariables.webAppRootKey);
private String filesString[] = null;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/ImportHelper.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/ImportHelper.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/ImportHelper.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/ImportHelper.java Thu Feb 9 15:26:35 2012
@@ -18,14 +18,14 @@
*/
package org.openmeetings.utils;
+import org.openmeetings.app.OpenmeetingsVariables;
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;
public class ImportHelper {
private static final org.slf4j.Logger log = Red5LoggerFactory.getLogger(
- ImportHelper.class, ScopeApplicationAdapter.webAppRootKey);
+ ImportHelper.class, OpenmeetingsVariables.webAppRootKey);
public static final int DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB
public static final int getMaxUploadSize(
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/Logger.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/Logger.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/Logger.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/Logger.java Thu Feb 9 15:26:35 2012
@@ -18,7 +18,7 @@
*/
package org.openmeetings.utils;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
public class Logger {
@@ -27,7 +27,7 @@ public class Logger {
public Logger() {
StackTraceElement ste = Thread.currentThread().getStackTrace()[1];
log = Red5LoggerFactory.getLogger(ste.getClass(),
- ScopeApplicationAdapter.webAppRootKey);
+ OpenmeetingsVariables.webAppRootKey);
}
private String getMethodMessage() {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/OMContextListener.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/OMContextListener.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/OMContextListener.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/OMContextListener.java Thu Feb 9 15:26:35 2012
@@ -20,7 +20,7 @@ package org.openmeetings.utils;
import javax.servlet.ServletContextEvent;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.ContextLoggingListener;
public class OMContextListener extends ContextLoggingListener {
@@ -30,10 +30,10 @@ public class OMContextListener extends C
}
public void contextInitialized(ServletContextEvent event) {
- ScopeApplicationAdapter.webAppRootKey = pathToName(event);
- ScopeApplicationAdapter.webAppRootPath = "/" + ScopeApplicationAdapter.webAppRootKey;
- System.setProperty("current_openmeetings_context_name", ScopeApplicationAdapter.webAppRootKey);
- System.setProperty("webapp.contextPath", ScopeApplicationAdapter.webAppRootPath);
+ OpenmeetingsVariables.webAppRootKey = pathToName(event);
+ OpenmeetingsVariables.webAppRootPath = "/" + OpenmeetingsVariables.webAppRootKey;
+ System.setProperty("current_openmeetings_context_name", OpenmeetingsVariables.webAppRootKey);
+ System.setProperty("webapp.contextPath", OpenmeetingsVariables.webAppRootPath);
System.setProperty("logback.configurationFile", "logback-config.xml");
super.contextInitialized(event);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/crypt/ManageCryptStyle.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/crypt/ManageCryptStyle.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/crypt/ManageCryptStyle.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/crypt/ManageCryptStyle.java Thu Feb 9 15:26:35 2012
@@ -18,6 +18,7 @@
*/
package org.openmeetings.utils.crypt;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
@@ -27,7 +28,7 @@ import org.springframework.beans.factory
public class ManageCryptStyle {
private static final Logger log = Red5LoggerFactory.getLogger(
- ManageCryptStyle.class, ScopeApplicationAdapter.webAppRootKey);
+ ManageCryptStyle.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Configurationmanagement cfgManagement;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/geom/GeomPoint.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/geom/GeomPoint.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/geom/GeomPoint.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/geom/GeomPoint.java Thu Feb 9 15:26:35 2012
@@ -20,9 +20,9 @@ package org.openmeetings.utils.geom;
import java.awt.Point;
-import org.slf4j.Logger;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
/**
*
@@ -35,7 +35,7 @@ import org.red5.logging.Red5LoggerFactor
public class GeomPoint extends Point {
private static final long serialVersionUID = 5729830653403076829L;
@SuppressWarnings("unused")
- private static final Logger log = Red5LoggerFactory.getLogger(GeomPoint.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(GeomPoint.class, OpenmeetingsVariables.webAppRootKey);
public GeomPoint add(GeomPoint p) {
GeomPoint gPoint = new GeomPoint();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/IcalHandler.java Thu Feb 9 15:26:35 2012
@@ -44,7 +44,7 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.model.property.Version;
import net.fortuna.ical4j.util.UidGenerator;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -56,7 +56,7 @@ import org.slf4j.Logger;
public class IcalHandler {
private static final Logger log = Red5LoggerFactory.getLogger(
- MailHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ MailHandler.class, OpenmeetingsVariables.webAppRootKey);
/** ICal instance */
private final net.fortuna.ical4j.model.Calendar icsCalendar;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailHandler.java Thu Feb 9 15:26:35 2012
@@ -18,8 +18,8 @@
*/
package org.openmeetings.utils.mail;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +32,7 @@ import org.springframework.beans.factory
public class MailHandler {
private static final Logger log = Red5LoggerFactory.getLogger(
- MailHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ MailHandler.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailThread.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailThread.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailThread.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailThread.java Thu Feb 9 15:26:35 2012
@@ -28,9 +28,9 @@ import javax.mail.Transport;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+import org.openmeetings.app.OpenmeetingsVariables;
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;
@@ -39,7 +39,7 @@ import org.springframework.core.task.Tas
public class MailThread {
private static final Logger log = Red5LoggerFactory.getLogger(
- MailHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ MailHandler.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Configurationmanagement cfgManagement;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailiCalThread.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailiCalThread.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailiCalThread.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mail/MailiCalThread.java Thu Feb 9 15:26:35 2012
@@ -32,9 +32,9 @@ import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
+import org.openmeetings.app.OpenmeetingsVariables;
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;
@@ -43,7 +43,7 @@ import org.springframework.core.task.Tas
public class MailiCalThread extends Thread {
private static final Logger log = Red5LoggerFactory.getLogger(
- MailiCalThread.class, ScopeApplicationAdapter.webAppRootKey);
+ MailiCalThread.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Configurationmanagement cfgManagement;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/CastMapToObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/CastMapToObject.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/CastMapToObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/CastMapToObject.java Thu Feb 9 15:26:35 2012
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -55,7 +55,7 @@ import org.slf4j.Logger;
public class CastMapToObject {
- private static final Logger log = Red5LoggerFactory.getLogger(CastMapToObject.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(CastMapToObject.class, OpenmeetingsVariables.webAppRootKey);
private CastMapToObject() {}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/StructureMethodList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/StructureMethodList.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/StructureMethodList.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/mappings/StructureMethodList.java Thu Feb 9 15:26:35 2012
@@ -18,18 +18,18 @@
*/
package org.openmeetings.utils.mappings;
-import java.util.LinkedHashMap;
-import java.lang.reflect.Method;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.LinkedHashMap;
-import org.slf4j.Logger;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
import org.apache.commons.lang.StringUtils;
+import org.openmeetings.app.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class StructureMethodList {
- private static final Logger log = Red5LoggerFactory.getLogger(StructureMethodList.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StructureMethodList.class, OpenmeetingsVariables.webAppRootKey);
private StructureMethodList() {}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/math/TimezoneUtil.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/math/TimezoneUtil.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/math/TimezoneUtil.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/math/TimezoneUtil.java Thu Feb 9 15:26:35 2012
@@ -22,12 +22,12 @@ import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.persistence.beans.basic.Configuration;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +35,7 @@ import org.springframework.beans.factory
public class TimezoneUtil {
private static final Logger log = Red5LoggerFactory.getLogger(
- TimezoneUtil.class, ScopeApplicationAdapter.webAppRootKey);
+ TimezoneUtil.class, OpenmeetingsVariables.webAppRootKey);
public static void main(String... args) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/stringhandlers/ChatString.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/stringhandlers/ChatString.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/stringhandlers/ChatString.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/utils/stringhandlers/ChatString.java Thu Feb 9 15:26:35 2012
@@ -25,14 +25,14 @@ import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.EmoticonsManager;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class ChatString {
- private static final Logger log = Red5LoggerFactory.getLogger(ChatString.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ChatString.class, OpenmeetingsVariables.webAppRootKey);
private static ChatString instance = null;
Modified: incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java Thu Feb 9 15:26:35 2012
@@ -18,18 +18,13 @@
*/
package org.openmeetings.axis.services;
-import java.util.Collections;
import java.util.Date;
-import java.util.List;
import java.util.LinkedList;
+import java.util.List;
-import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Sessionmanagement;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl;
-import org.openmeetings.app.data.calendar.management.AppointmentLogic;
-import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,27 +39,16 @@ import org.springframework.beans.factory
public class CalendarWebService {
private static final Logger log = Red5LoggerFactory.getLogger(
- CalendarWebService.class, ScopeApplicationAdapter.webAppRootKey);
+ CalendarWebService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private AppointmentLogic appointmentLogic;
- @Autowired
private AppointmentDaoImpl appointmentDao;
- @Autowired
- private Sessionmanagement sessionManagement;
- @Autowired
- private Usermanagement userManagement;
- @Autowired
- private AuthLevelmanagement authLevelManagement;
public List<Appointment> getAppointmentByRange(String SID, Date starttime,
Date endtime) {
log.debug("getAppointmentByRange : startdate - " + starttime
+ ", enddate - " + endtime);
try {
- Long users_id = sessionManagement.checkSession(SID);
- Long user_level = userManagement.getUserLevelByID(users_id);
-
LinkedList<Appointment> apps = new LinkedList<Appointment>();
apps.add(appointmentDao.getAppointmentById(1L));
return apps;
Modified: incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java Thu Feb 9 15:26:35 2012
@@ -26,8 +26,8 @@ import javax.servlet.ServletContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.persistence.beans.calendar.Appointment;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
@@ -36,7 +36,7 @@ import org.springframework.web.context.s
public class CalendarWebServiceFacade {
private static final Logger log = Red5LoggerFactory.getLogger(
- RoomWebServiceFacade.class, ScopeApplicationAdapter.webAppRootKey);
+ RoomWebServiceFacade.class, OpenmeetingsVariables.webAppRootKey);
private ServletContext getServletContext() throws Exception {
MessageContext mc = MessageContext.getCurrentMessageContext();
Modified: incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java Thu Feb 9 15:26:35 2012
@@ -35,6 +35,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.basic.files.TestObject;
@@ -65,7 +66,7 @@ import org.springframework.beans.factory
public class FileWebService {
private static final Logger log = Red5LoggerFactory.getLogger(
- FileWebService.class, ScopeApplicationAdapter.webAppRootKey);
+ FileWebService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
Modified: incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebServiceFacade.java Thu Feb 9 15:26:35 2012
@@ -23,10 +23,10 @@ import javax.servlet.ServletContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.file.dto.FileExplorerObject;
import org.openmeetings.app.data.file.dto.LibraryPresentation;
import org.openmeetings.app.persistence.beans.files.FileExplorerItem;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
@@ -35,7 +35,7 @@ import org.springframework.web.context.s
public class FileWebServiceFacade {
private static final Logger log = Red5LoggerFactory.getLogger(
- FileWebServiceFacade.class, ScopeApplicationAdapter.webAppRootKey);
+ FileWebServiceFacade.class, OpenmeetingsVariables.webAppRootKey);
private ServletContext getServletContext() throws Exception {
MessageContext mc = MessageContext.getCurrentMessageContext();
Modified: incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebService.java Thu Feb 9 15:26:35 2012
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Map;
import org.apache.axis2.AxisFault;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.beans.basic.SearchResult;
@@ -61,7 +62,7 @@ import org.springframework.beans.factory
public class RoomWebService {
private static final Logger log = Red5LoggerFactory.getLogger(
- RoomWebService.class, ScopeApplicationAdapter.webAppRootKey);
+ RoomWebService.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
private AppointmentDaoImpl appointmentDao;
Modified: incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java Thu Feb 9 15:26:35 2012
@@ -26,11 +26,11 @@ import javax.servlet.ServletContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.persistence.beans.flvrecord.FlvRecording;
import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
@@ -39,7 +39,7 @@ import org.springframework.web.context.s
public class RoomWebServiceFacade {
private static final Logger log = Red5LoggerFactory.getLogger(
- RoomWebServiceFacade.class, ScopeApplicationAdapter.webAppRootKey);
+ RoomWebServiceFacade.class, OpenmeetingsVariables.webAppRootKey);
private ServletContext getServletContext() throws Exception {
MessageContext mc = MessageContext.getCurrentMessageContext();
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingSessionList.java Thu Feb 9 15:26:35 2012
@@ -24,6 +24,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
@@ -41,7 +42,7 @@ import org.springframework.beans.factory
*/
public class ServerSharingSessionList {
- private static final Logger log = Red5LoggerFactory.getLogger(ServerSharingSessionList.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerSharingSessionList.class, OpenmeetingsVariables.webAppRootKey);
private static Map<String,ServerSharingSessionBean> sharingSessions = new HashMap<String,ServerSharingSessionBean>();
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingViewersList.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingViewersList.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingViewersList.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/cache/ServerSharingViewersList.java Thu Feb 9 15:26:35 2012
@@ -24,7 +24,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.server.beans.ServerSharingViewerBean;
import org.openmeetings.server.beans.ServerViewerRegisterBean;
import org.red5.logging.Red5LoggerFactory;
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
*/
public class ServerSharingViewersList {
- private static final Logger log = Red5LoggerFactory.getLogger(ServerSharingSessionList.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerSharingSessionList.class, OpenmeetingsVariables.webAppRootKey);
private static Map<String,List<ServerSharingViewerBean>> viewerSessions = new HashMap<String,List<ServerSharingViewerBean>>();
/**
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestDecoder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestDecoder.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestDecoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestDecoder.java Thu Feb 9 15:26:35 2012
@@ -19,11 +19,11 @@
package org.openmeetings.server.codec;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
import org.openmeetings.server.beans.ServerStatusBean;
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
*/
public class ServerDesktopRequestDecoder extends CumulativeProtocolDecoder {
- private static final Logger log = Red5LoggerFactory.getLogger(ServerDesktopRequestDecoder.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerDesktopRequestDecoder.class, OpenmeetingsVariables.webAppRootKey);
private static final String DECODER_STATE_KEY = ServerDesktopRequestDecoder.class.getName() + ".STATE";
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/codec/ServerDesktopRequestEncoder.java Thu Feb 9 15:26:35 2012
@@ -24,7 +24,7 @@ import org.apache.mina.core.buffer.IoBuf
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoder;
import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.beans.ServerFrameCursorStatus;
import org.openmeetings.server.beans.ServerStatusBean;
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
*/
public class ServerDesktopRequestEncoder implements ProtocolEncoder {
- private static Logger log = Red5LoggerFactory.getLogger(ServerDesktopRequestEncoder.class, ScopeApplicationAdapter.webAppRootKey);
+ private static Logger log = Red5LoggerFactory.getLogger(ServerDesktopRequestEncoder.class, OpenmeetingsVariables.webAppRootKey);
public void encode(IoSession session, Object message, ProtocolEncoderOutput out) throws Exception {
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/rtmp/ScreenClient.java Thu Feb 9 15:26:35 2012
@@ -22,7 +22,7 @@ package org.openmeetings.server.rtmp;
//import org.apache.mina.common.ByteBuffer;
import java.io.IOException;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.event.IEvent;
@@ -52,8 +52,7 @@ import org.slf4j.Logger;
public class ScreenClient extends RTMPClient implements INetStreamEventHandler,
ClientExceptionHandler, IPendingServiceCallback {
- private static final Logger logger = Red5LoggerFactory.getLogger(ScreenClient.class, ScopeApplicationAdapter.webAppRootKey);
- //private static final Logger logger = Red5LoggerFactory.getLogger( RTMPUser.class );
+ private static final Logger logger = Red5LoggerFactory.getLogger(ScreenClient.class, OpenmeetingsVariables.webAppRootKey);
public boolean createdPlayStream = false;
@@ -69,9 +68,6 @@ public class ScreenClient extends RTMPCl
private RTMPConnection conn;
- //private ByteBuffer buffer;
-
-
// ------------------------------------------------------------------------
//
// Overide
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/servlets/ServerOutputHandler.java Thu Feb 9 15:26:35 2012
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.cache.ServerSharingSessionList;
import org.red5.logging.Red5LoggerFactory;
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
*/
public class ServerOutputHandler extends HttpServlet {
- private static final Logger log = Red5LoggerFactory.getLogger(ServerOutputHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerOutputHandler.class, OpenmeetingsVariables.webAppRootKey);
/**
*
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketHandler.java Thu Feb 9 15:26:35 2012
@@ -19,7 +19,7 @@
package org.openmeetings.server.socket;
//import org.slf4j.Logger;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.server.beans.ServerFrameBean;
import org.openmeetings.server.util.DePacketizerUtil;
import org.red5.logging.Red5LoggerFactory;
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
*/
public class ServerPacketHandler {
- private static final Logger log = Red5LoggerFactory.getLogger(ServerPacketHandler.class, ScopeApplicationAdapter.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerPacketHandler.class, OpenmeetingsVariables.webAppRootKey);
/**
* @param data