[Red5commits] [1439] reverted configs to jetty and no cache
pgregoire
luke at codegent.com
Wed Sep 27 12:50:16 EDT 2006
reverted configs to jetty and no cache
Timestamp: 09/27/06 11:44:45 EST (less than one hour ago)
Change: 1439
Author: pgregoire
Files (see diff or trac for details):
java/server/trunk/conf/red5-common.xml
java/server/trunk/conf/red5-core.xml
java/server/trunk/conf/red5.xml
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1439
Index: /java/server/trunk/conf/red5-common.xml
===================================================================
--- /java/server/trunk/conf/red5-common.xml (revision 1400)
+++ /java/server/trunk/conf/red5-common.xml (revision 1439)
@@ -98,9 +98,11 @@
<!-- Now we can load the cache engine -->
+ <bean id="object.cache" class="org.red5.server.cache.NoCacheImpl" />
+
<!-- bean id="object.cache" class="org.red5.server.cache.CacheImpl" init-method="init" autowire="byType">
<property name="maxEntries"><value>5</value></property>
</bean -->
- <bean id="object.cache" class="org.red5.server.cache.WhirlyCacheImpl" init-method="init" autowire="byType">
+ <!-- bean id="object.cache" class="org.red5.server.cache.WhirlyCacheImpl" init-method="init" autowire="byType">
<property name="maxEntries" value="5" />
<property name="cacheConfig">
@@ -108,27 +110,9 @@
<property name="name" value="flv.cache" />
<property name="maxSize" value="5" />
- <!-- This policy removes cached items, biased towards least frequently used (LFU) Items -->
<property name="policy"><value>com.whirlycott.cache.policy.LFUMaintenancePolicy</value></property>
- <!-- This policy removes cached items, biased towards least recently used (LRU) Items -->
- <!-- property name="policy"><value>com.whirlycott.cache.policy.LRUMaintenancePolicy</value></property -->
- <!-- This policy removes cache items in the order in which they were added -->
- <!-- property name="policy"><value>com.whirlycott.cache.policy.FIFOMaintenancePolicy</value></property -->
- <!-- A predicate for filtering Collections of Items based on their expiration time -->
- <!-- property name="policy"><value>com.whirlycott.cache.policy.ExpirationTimePredicate</value></property -->
- <!-- property name="backend"><value>com.whirlycott.cache.impl.ConcurrentHashMapImpl</value></property -->
<property name="backend"><value>com.whirlycott.cache.impl.FastHashMapImpl</value></property>
</bean>
</property>
- </bean>
-
- <!-- Then we load the scripting context, with the common as parent -->
- <bean id="script.context" class="org.red5.server.script.ScriptObjectContext" init-method="init">
- <property name="scriptBeanFactory">
- <bean class="org.red5.server.script.ScriptBeanFactory" />
- </property>
- <property name="scriptManager">
- <bean class="javax.script.ScriptEngineManager" />
- </property>
- </bean>
+ </bean -->
</beans>
Index: /java/server/trunk/conf/red5-core.xml
===================================================================
--- /java/server/trunk/conf/red5-core.xml (revision 1400)
+++ /java/server/trunk/conf/red5-core.xml (revision 1439)
@@ -94,7 +94,8 @@
</bean>
+ <!-- Jetty Container -->
+ <bean id="rtmpt.server" class="org.red5.server.net.rtmpt.RTMPTLoader" init-method="init" autowire="byType" />
+ <!-- Tomcat Container -->
<!--
- <bean id="rtmpt.server" class="org.red5.server.net.rtmpt.RTMPTLoader" init-method="init" autowire="byType" />
--->
<bean id="rtmpt.server" class="org.red5.server.net.rtmpt.TomcatRTMPTLoader" init-method="init" autowire="byType">
<property name="embedded">
@@ -109,5 +110,4 @@
</property>
- <!-- Non-SSL HTTP/1.1 Connector -->
<property name="connector">
<bean class="org.apache.catalina.connector.Connector">
@@ -127,12 +127,4 @@
</property>
- <!--
- <property name="context">
- <bean class="org.apache.catalina.core.StandardContext">
- <property name="name" value="rtmptContext" />
- <property name="reloadable" value="false" />
- </bean>
- </property>
- -->
<property name="context">
<map>
@@ -181,5 +173,6 @@
</bean>
-
+-->
+
<bean id="debugProxyIoHandler" class="org.red5.server.net.proxy.DebugProxyHandler">
<property name="codecFactory" ref="rtmpCodecFactory" />
Index: /java/server/trunk/conf/red5.xml
===================================================================
--- /java/server/trunk/conf/red5.xml (revision 1400)
+++ /java/server/trunk/conf/red5.xml (revision 1439)
@@ -32,22 +32,11 @@
<!-- Now we can load the servlet engine, this has to happen after the context are loaded -->
- <!-- bean id="jetty6.server" class="org.red5.server.JettyLoader" init-method="init" autowire="byType" / -->
+ <bean id="jetty6.server" class="org.red5.server.JettyLoader" init-method="init" autowire="byType" />
- <bean id="tomcat.server" class="org.red5.server.TomcatLoader" init-method="init" destroy-method="shutdown" autowire="byType">
- <!-- Use this to configure Tomcat via Spring -->
+ <!-- bean id="tomcat.server" class="org.red5.server.TomcatLoader" init-method="init" destroy-method="shutdown" autowire="byType">
<property name="embedded">
<bean class="org.apache.catalina.startup.Embedded" />
</property>
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie : - - >
- <property name="engine.standalone">
- <bean class="org.apache.catalina.core.StandardEngine">
- <property name="defaultHost" value="localhost" />
- <property name="jvmRoute" value="jvm1" />
- </bean>
- </property>
- -->
- <!-- Top level container in our container hierarchy -->
<property name="engine">
<bean class="org.apache.catalina.core.StandardEngine">
@@ -57,47 +46,8 @@
</property>
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits that are performed
- against this UserDatabase are immediately available for use by the Realm. - - >
- <property name="realm">
- <bean class="org.apache.catalina.realm.UserDatabaseRealm">
- <property name="resourceName">
- <bean id="UserDatabase" class="org.apache.catalina.UserDatabase">
- <property name="auth" value="Container" />
- <property name="factory" value="org.apache.catalina.users.MemoryUserDatabaseFactory" />
- <property name="pathname" value="conf/tomcat-users.xml" />
- </bean>
- </property>
- </bean>
- </property>
- -->
-
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
<property name="realm">
<bean class="org.apache.catalina.realm.MemoryRealm" />
</property>
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC - - >
- <property name="realm">
- <bean class="org.apache.catalina.realm.JDBCRealm">
- <property name="driverName">
- <bean id="UserDatabase" class="org.gjt.mm.mysql.Driver">
- <property name="connectionURL" value="jdbc:mysql://localhost/authority" />
- <property name="connectionName" value="test" />
- <property name="connectionPassword" value="test" />
- <property name="userTable" value="users" />
- <property name="userNameCol" value="user_name" />
- <property name="userCredCol" value="user_pass" />
- <property name="userRoleTable" value="user_roles" />
- <property name="roleNameCol" value="role_name" />
- </bean>
- </property>
- </bean>
- </property>
- -->
-
- <!-- Non-SSL HTTP/1.1 Connector -->
<property name="connector">
<bean class="org.apache.catalina.connector.Connector">
@@ -105,39 +55,7 @@
<property name="redirectPort"><value>8443</value></property>
<property name="enableLookups"><value>false</value></property>
- <!--
- <property name="scheme"><value>http</value></property>
- <property name="secure" value="false" />
- <property name="proxyName" value="??" />
- <property name="proxyPort" value="8090" />
- <property name="maxPostSize" value="2048" />
- <property name="maxSavePostSize" value="4" />
- -->
</bean>
</property>
- <!-- SSL HTTP/1.1 Connector - - >
- <property name="connector.https">
- <bean class="org.apache.catalina.connector.Connector">
- <property name="port"><value>8443</value></property>
- <property name="scheme"><value>https</value></property>
- <property name="secure"><value>true</value></property>
- <property name="clientAuth"><value>false</value></property>
- <property name="sslProtocol"><value>TLS</value></property>
- </bean>
- </property>
- -->
-
- <!-- An AJP 1.3 Connector - - >
- <property name="connector.ajp">
- <bean class="org.apache.coyote.tomcat5.CoyoteConnector">
- <property name="port"><value>8009</value></property>
- <property name="protocol"><value>AJP/1.3</value></property>
- <property name="protocolHandlerClassName">
- <bean class="org.apache.jk.server.JkCoyoteHandler" />
- </property>
- </bean>
- </property>
- -->
-
<property name="baseHost">
<bean class="org.apache.catalina.core.StandardHost">
@@ -152,5 +70,4 @@
<property name="valves">
<list>
- <!--
<bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
<property name="directory" value="." />
@@ -161,14 +78,4 @@
<property name="rotatable" value="true" />
</bean>
- <bean id="valve.extended" class="org.apache.catalina.valves.ExtendedAccessLogValve">
- <property name="directory" value="." />
- <property name="prefix" value="localhost_ext." />
- <property name="suffix" value=".log" />
- <property name="pattern" value="common" />
- <property name="rotatable" value="true" />
- <property name="fileDateFormat" value="[MM/dd/yyyy HH:mm:ss:SSS zz]" />
- </bean>
- <bean id="valve.reqs" class="org.apache.catalina.valves.RequestDumperValve" />
- -->
</list>
</property>
@@ -191,5 +98,5 @@
</property>
- </bean>
+ </bean -->
<!-- Default context. This can be shared between web app contexts -->
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list