Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerPacketMinaHandler.java Thu Feb 9 15:26:35 2012 @@ -24,7 +24,7 @@ import org.apache.mina.core.buffer.IoBuf import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; -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 ServerPacketMinaHandler extends IoHandlerAdapter { - private static final Logger log = Red5LoggerFactory.getLogger(ServerPacketMinaHandler.class, ScopeApplicationAdapter.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(ServerPacketMinaHandler.class, OpenmeetingsVariables.webAppRootKey); private ServerSocketMinaProcess server;
Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerSocketMinaProcess.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerSocketMinaProcess.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerSocketMinaProcess.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/socket/ServerSocketMinaProcess.java Thu Feb 9 15:26:35 2012 @@ -27,7 +27,7 @@ import org.apache.mina.core.session.IoSe import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.logging.LoggingFilter; import org.apache.mina.transport.socket.nio.NioSocketAcceptor; -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.ServerSharingSessionBean; @@ -47,7 +47,7 @@ import org.springframework.beans.factory */ public class ServerSocketMinaProcess { - private static final Logger log = Red5LoggerFactory.getLogger(ServerSocketMinaProcess.class, ScopeApplicationAdapter.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(ServerSocketMinaProcess.class, OpenmeetingsVariables.webAppRootKey); private static NioSocketAcceptor acceptor = null; Modified: incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/server/org/openmeetings/server/util/DePacketizerUtil.java Thu Feb 9 15:26:35 2012 @@ -18,7 +18,7 @@ */ package org.openmeetings.server.util; -import org.openmeetings.app.remote.red5.ScopeApplicationAdapter; +import org.openmeetings.app.OpenmeetingsVariables; import org.openmeetings.server.beans.ServerFrameBean; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -28,7 +28,7 @@ import org.slf4j.Logger; */ public class DePacketizerUtil { - private static final Logger log = Red5LoggerFactory.getLogger(DePacketizerUtil.class, ScopeApplicationAdapter.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(DePacketizerUtil.class, OpenmeetingsVariables.webAppRootKey); public ServerFrameBean handleReceivingBytes(byte[] incomingBytes) { try { Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentAddAppointment.java Thu Feb 9 15:26:35 2012 @@ -28,8 +28,8 @@ import java.util.List; import java.util.Map; import org.junit.Test; +import org.openmeetings.app.OpenmeetingsVariables; import org.openmeetings.app.data.calendar.management.AppointmentLogic; -import org.openmeetings.app.remote.red5.ScopeApplicationAdapter; import org.openmeetings.test.AbstractOpenmeetingsSpringTest; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -40,7 +40,7 @@ public class TestAppointmentAddAppointme private static final Logger log = Red5LoggerFactory.getLogger( TestAppointmentAddAppointment.class, - ScopeApplicationAdapter.webAppRootKey); + OpenmeetingsVariables.webAppRootKey); @Autowired private AppointmentLogic appointmentLogic; Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestAppointmentSchedulerTask.java Thu Feb 9 15:26:35 2012 @@ -21,8 +21,8 @@ package org.openmeetings.test.calendar; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.openmeetings.app.OpenmeetingsVariables; import org.openmeetings.app.data.calendar.management.AppointmentLogic; -import org.openmeetings.app.remote.red5.ScopeApplicationAdapter; import org.openmeetings.test.AbstractOpenmeetingsSpringTest; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -30,7 +30,7 @@ import org.springframework.beans.factory public class TestAppointmentSchedulerTask extends AbstractOpenmeetingsSpringTest { - private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class, ScopeApplicationAdapter.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class, OpenmeetingsVariables.webAppRootKey); @Autowired private AppointmentLogic appointmentLogic; Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/calendar/TestSendIcalMessage.java Thu Feb 9 15:26:35 2012 @@ -61,9 +61,9 @@ import net.fortuna.ical4j.model.property import net.fortuna.ical4j.util.UidGenerator; import org.junit.Test; +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.openmeetings.test.AbstractOpenmeetingsSpringTest; import org.openmeetings.utils.mail.ByteArrayDataSource; import org.openmeetings.utils.mail.IcalHandler; @@ -76,7 +76,7 @@ public class TestSendIcalMessage extends private static final Logger log = Red5LoggerFactory.getLogger( TestAppointmentSchedulerTask.class, - ScopeApplicationAdapter.webAppRootKey); + OpenmeetingsVariables.webAppRootKey); @Autowired private Configurationmanagement cfgManagement; Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebService.java Thu Feb 9 15:26:35 2012 @@ -21,6 +21,7 @@ package org.openmeetings.axis.services; import java.util.Date; import org.apache.axis2.AxisFault; +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.ErrorManagement; @@ -39,7 +40,6 @@ import org.openmeetings.app.persistence. import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues; import org.openmeetings.app.persistence.beans.user.Users; import org.openmeetings.app.remote.MainService; -import org.openmeetings.app.remote.red5.ScopeApplicationAdapter; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +59,7 @@ import com.thoughtworks.xstream.io.xml.D public class UserWebService { private static final Logger log = Red5LoggerFactory.getLogger( - UserWebService.class, ScopeApplicationAdapter.webAppRootKey); + UserWebService.class, OpenmeetingsVariables.webAppRootKey); @Autowired private Sessionmanagement sessionManagement; Modified: incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java?rev=1242358&r1=1242357&r2=1242358&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/userservice/org/openmeetings/axis/services/UserWebServiceFacade.java Thu Feb 9 15:26:35 2012 @@ -23,11 +23,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.ErrorResult; import org.openmeetings.app.data.beans.basic.SearchResult; import org.openmeetings.app.persistence.beans.basic.Sessiondata; 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.context.ApplicationContext; @@ -36,7 +36,7 @@ import org.springframework.web.context.s public class UserWebServiceFacade { private static final Logger log = Red5LoggerFactory.getLogger( - UserWebServiceFacade.class, ScopeApplicationAdapter.webAppRootKey); + UserWebServiceFacade.class, OpenmeetingsVariables.webAppRootKey); private ServletContext getServletContext() throws Exception { MessageContext mc = MessageContext.getCurrentMessageContext();
