Author: solomax
Date: Fri Apr 18 04:37:24 2014
New Revision: 1588410
URL: http://svn.apache.org/r1588410
Log:
[OPENMEETINGS-978] OM can be started in offline mode
Removed:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/NoValidationApplicationContext.java
Modified:
openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/red5-web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/red5-web.xml?rev=1588410&r1=1588409&r2=1588410&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/red5-web.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/red5-web.xml Fri Apr 18
04:37:24 2014
@@ -18,24 +18,26 @@
under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
-<beans>
-
- <bean id="red5WebPlaceholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="systemPropertiesModeName"
value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
- <property name="location" value="/WEB-INF/red5-web.properties" />
- </bean>
-
- <bean id="web.context" class="org.red5.server.Context" autowire="byType" />
-
- <bean id="web.scope" class="org.red5.server.scope.WebScope"
init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="web.context" />
- <property name="handler" ref="web.handler" />
- <property name="contextPath" value="${webapp.contextPath}" />
- <property name="virtualHosts" value="${webapp.virtualHosts}" />
- </bean>
-
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.1.xsd";>
+
+ <bean id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="/WEB-INF/red5-web.properties" />
+ </bean>
+
+ <bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
+
+ <bean id="web.scope" class="org.red5.server.scope.WebScope"
init-method="register">
+ <property name="server" ref="red5.server" />
+ <property name="parent" ref="global.scope" />
+ <property name="context" ref="web.context" />
+ <property name="handler" ref="web.handler" />
+ <property name="contextPath" value="${webapp.contextPath}" />
+ <property name="virtualHosts" value="${webapp.virtualHosts}" />
+ </bean>
+
<import resource="classes/openmeetings-applicationContext.xml" />
</beans>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml?rev=1588410&r1=1588409&r2=1588410&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/red5-web.xml
Fri Apr 18 04:37:24 2014
@@ -18,24 +18,26 @@
under the License.
-->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
-<beans>
-
- <bean id="red5WebPlaceholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="systemPropertiesModeName"
value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
- <property name="location" value="/WEB-INF/red5-web.properties" />
- </bean>
-
- <bean id="web.context" class="org.red5.server.Context" autowire="byType" />
-
- <bean id="web.scope" class="org.red5.server.scope.WebScope"
init-method="register">
- <property name="server" ref="red5.server" />
- <property name="parent" ref="global.scope" />
- <property name="context" ref="web.context" />
- <property name="handler" ref="web.handler" />
- <property name="contextPath" value="${webapp.contextPath}" />
- <property name="virtualHosts" value="${webapp.virtualHosts}" />
- </bean>
-
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-3.1.xsd";>
+
+ <bean id="placeholderConfig"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location" value="/WEB-INF/red5-web.properties" />
+ </bean>
+
+ <bean id="web.context" class="org.red5.server.Context"
autowire="byType" />
+
+ <bean id="web.scope" class="org.red5.server.scope.WebScope"
init-method="register">
+ <property name="server" ref="red5.server" />
+ <property name="parent" ref="global.scope" />
+ <property name="context" ref="web.context" />
+ <property name="handler" ref="web.handler" />
+ <property name="contextPath" value="${webapp.contextPath}" />
+ <property name="virtualHosts" value="${webapp.virtualHosts}" />
+ </bean>
+
<import resource="classes/openmeetings-applicationContext.xml" />
</beans>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml?rev=1588410&r1=1588409&r2=1588410&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Fri Apr 18 04:37:24 2014
@@ -77,10 +77,6 @@
<param-name>parentContextKey</param-name>
<param-value>default.context</param-value>
</context-param>
- <context-param>
- <param-name>contextClass</param-name>
-
<param-value>org.apache.openmeetings.util.NoValidationApplicationContext</param-value>
- </context-param>
<!-- remove the following servlet tags if you want to disable remoting for
this application -->
<servlet>
