[Red5commits] [red5 commit] r3409 - java/server/trunk/src/conf

[codesite-noreply at google.com]

Author: mondain
Date: Thu Jan 22 10:24:59 2009
New Revision: 3409

Modified:
    java/server/trunk/src/conf/red5-common.xml
    java/server/trunk/src/conf/red5-core.xml
    java/server/trunk/src/conf/red5-edge-core.xml
    java/server/trunk/src/conf/red5-edge.xml
    java/server/trunk/src/conf/red5-origin-core.xml
    java/server/trunk/src/conf/red5-origin.xml
    java/server/trunk/src/conf/red5.xml

Log:
Added patch from Carl to update schema links to Spring 2.5

Modified: java/server/trunk/src/conf/red5-common.xml
==============================================================================
--- java/server/trunk/src/conf/red5-common.xml	(original)
+++ java/server/trunk/src/conf/red5-common.xml	Thu Jan 22 10:24:59 2009
@@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8" ?>
  <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-2.0.xsd                             
http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+	 xmlns:lang="http://www.springframework.org/schema/lang"  
xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd                             
http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
  	<bean id="placeholderConfig"
  		 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
  		<property name="location" value="classpath:/red5.properties" />
@@ -218,4 +218,4 @@
  		<property name="underrunTrigger" value="10"/>
  	</bean>
  	<bean id="clientBroadcastStream" scope="prototype" lazy-init="true"  
class="org.red5.server.stream.ClientBroadcastStream"/>
-</beans>
+</beans>
\ No newline at end of file

Modified: java/server/trunk/src/conf/red5-core.xml
==============================================================================
--- java/server/trunk/src/conf/red5-core.xml	(original)
+++ java/server/trunk/src/conf/red5-core.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
  	<!-- This context holds all the networking: mina -->

  	<bean id="customEditorConfigurer"
@@ -265,4 +265,3 @@
  	</bean>
  	-->
  </beans>
-

Modified: java/server/trunk/src/conf/red5-edge-core.xml
==============================================================================
--- java/server/trunk/src/conf/red5-edge-core.xml	(original)
+++ java/server/trunk/src/conf/red5-edge-core.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
  	<!-- This context holds all the networking: mina -->

  	<bean id="customEditorConfigurer"
@@ -114,4 +114,3 @@
  	</bean>
  	-->
  </beans>
-

Modified: java/server/trunk/src/conf/red5-edge.xml
==============================================================================
--- java/server/trunk/src/conf/red5-edge.xml	(original)
+++ java/server/trunk/src/conf/red5-edge.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">

  	<!-- This file just wires together the context tree. Its accessed by  
ContextSingletonBeanFactoryLocator -->
  	
@@ -34,4 +34,4 @@
  		<property name="parentContext" ref="red5.common" />
  		<property name="contextsConfig" value="red5.globals" />
  	</bean>	
-</beans>
+</beans>
\ No newline at end of file

Modified: java/server/trunk/src/conf/red5-origin-core.xml
==============================================================================
--- java/server/trunk/src/conf/red5-origin-core.xml	(original)
+++ java/server/trunk/src/conf/red5-origin-core.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">
  	<!-- This context holds all the networking: mina -->

  	<bean id="customEditorConfigurer"
@@ -301,4 +301,3 @@
  	</bean>	

  </beans>
-

Modified: java/server/trunk/src/conf/red5-origin.xml
==============================================================================
--- java/server/trunk/src/conf/red5-origin.xml	(original)
+++ java/server/trunk/src/conf/red5-origin.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">

  	<!-- This file just wires together the context tree. Its accessed by  
ContextSingletonBeanFactoryLocator -->
  	
@@ -151,4 +151,4 @@
  	-->
  	<!-- You can add further contexts here. This allows for multiple separate  
global scopes --> 	
  	
-</beans>
+</beans>
\ No newline at end of file

Modified: java/server/trunk/src/conf/red5.xml
==============================================================================
--- java/server/trunk/src/conf/red5.xml	(original)
+++ java/server/trunk/src/conf/red5.xml	Thu Jan 22 10:24:59 2009
@@ -2,8 +2,8 @@
  <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-2.0.xsd
-                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans  
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/lang  
http://www.springframework.org/schema/lang/spring-lang-2.5.xsd">

  	<!-- This file just wires together the context tree. Its accessed by  
ContextSingletonBeanFactoryLocator -->
  	
@@ -87,4 +87,4 @@
  	
  	</bean>     	
  	
-</beans>
+</beans>
\ No newline at end of file