Revision: 7419
Author: [email protected]
Date: Tue Aug 11 23:16:32 2009
Log: changed beans file as per standalone config files
http://code.google.com/p/mobicents/source/detail?r=7419
Added:
/trunk/servers/media/core/server-sar/src/main/config/cnf-jboss-beans.xml
Deleted:
/trunk/servers/media/core/server-sar/src/main/config/cnf-beans.xml
Modified:
/trunk/servers/media/core/server-sar/src/main/config/ann-jboss-beans.xml
/trunk/servers/media/core/server-sar/src/main/config/ivr-jboss-beans.xml
/trunk/servers/media/core/server-sar/src/main/config/packetrelay-jboss-beans.xml
=======================================
--- /dev/null
+++
/trunk/servers/media/core/server-sar/src/main/config/cnf-jboss-beans.xml
Tue Aug 11 23:16:32 2009
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Cnf-DefaultChannelFactory"
+ class="org.mobicents.media.server.resource.ChannelFactory" />
+
+ <bean name="Cnf-Pipe-1"
+ class="org.mobicents.media.server.resource.PipeFactory">
+ <property name="outlet">audio.processor</property>
+ </bean>
+ <bean name="Cnf-Pipe-2"
+ class="org.mobicents.media.server.resource.PipeFactory">
+ <property name="inlet">audio.processor</property>
+ </bean>
+
+ <bean name="Cnf-Dsp-ChannelFactory"
+ class="org.mobicents.media.server.resource.ChannelFactory">
+ <property name="components">
+ <list>
+ <inject bean="AudioProcessorFactory" />
+ </list>
+ </property>
+ <property name="pipes">
+ <list>
+ <inject bean="Cnf-Pipe-1" />
+ <inject bean="Cnf-Pipe-2" />
+ </list>
+ </property>
+ </bean>
+
+ <bean name="CnfBridgeFactory"
+
class="org.mobicents.media.server.impl.resource.cnf.CnfBridgeFactory">
+ <property name="name">cnf.bridge</property>
+ </bean>
+
+ <bean name="CnfConnectionFactory"
+ class="org.mobicents.media.server.ConnectionFactory">
+ <property name="txChannelFactory">
+ <inject bean="Cnf-Dsp-ChannelFactory" />
+ </property>
+ <property name="rxChannelFactory">
+ <inject bean="Cnf-Dsp-ChannelFactory" />
+ </property>
+ </bean>
+
+ <!-- Conference with RTP and DSP -->
+ <bean name="CnfEndpoint-1"
+ class="org.mobicents.media.server.EndpointImpl">
+ <property name="localName">
+ /mobicents/media/cnf/[1..10]
+ </property>
+ <property name="timer">
+ <inject bean="Timer" />
+ </property>
+
+ <property name="groupFactory">
+ <inject bean="CnfBridgeFactory" />
+ </property>
+
+ <property name="rtpFactory">
+ <map class="java.util.Hashtable"
keyClass="java.lang.String"
+
valueClass="org.mobicents.media.server.impl.rtp.RtpFactory">
+ <entry>
+ <key>audio</key>
+ <value>
+ <inject bean="RTPAudioFactory"
/>
+ </value>
+ </entry>
+ </map>
+ </property>
+
+ <property name="connectionFactory">
+ <inject bean="CnfConnectionFactory" />
+ </property>
+ </bean>
+
+ <bean name="CnfLocalConnectionFactory"
+ class="org.mobicents.media.server.ConnectionFactory">
+ <property name="txChannelFactory">
+ <inject bean="Cnf-DefaultChannelFactory" />
+ </property>
+ <property name="rxChannelFactory">
+ <inject bean="Cnf-DefaultChannelFactory" />
+ </property>
+ </bean>
+
+ <!-- Conference local bridge -->
+ <bean name="CnfEndpoint-local"
+ class="org.mobicents.media.server.EndpointImpl">
+ <property name="localName">
+ /mobicents/media/cnf/local/[1..10]
+ </property>
+ <property name="timer">
+ <inject bean="Timer" />
+ </property>
+
+ <property name="groupFactory">
+ <inject bean="CnfBridgeFactory" />
+ </property>
+ <property name="connectionFactory">
+ <inject bean="CnfLocalConnectionFactory" />
+ </property>
+
+ </bean>
+
+</deployment>
=======================================
--- /trunk/servers/media/core/server-sar/src/main/config/cnf-beans.xml Wed
Jun 10 05:50:55 2009
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="Cnf-DefaultChannelFactory"
- class="org.mobicents.media.server.resource.ChannelFactory" />
-
- <bean name="Cnf-Pipe-1"
- class="org.mobicents.media.server.resource.PipeFactory">
- <property name="outlet">audio.processor</property>
- </bean>
- <bean name="Cnf-Pipe-2"
- class="org.mobicents.media.server.resource.PipeFactory">
- <property name="inlet">audio.processor</property>
- </bean>
-
- <bean name="Cnf-Dsp-ChannelFactory"
- class="org.mobicents.media.server.resource.ChannelFactory">
- <property name="components">
- <list>
- <inject bean="AudioProcessorFactory" />
- </list>
- </property>
- <property name="pipes">
- <list>
- <inject bean="Cnf-Pipe-1" />
- <inject bean="Cnf-Pipe-2" />
- </list>
- </property>
- </bean>
-
- <bean name="CnfBridgeSink"
-
class="org.mobicents.media.server.impl.resource.cnf.ConferenceSinkFactory">
- <property name="name">cnf.sink</property>
- </bean>
-
- <bean name="CnfBridgeSource"
-
class="org.mobicents.media.server.impl.resource.cnf.ConferenceSourceFactory">
- <property name="name">cnf.source</property>
- </bean>
-
- <!-- Conference with RTP and DSP -->
- <bean name="CnfEndpoint-1"
- class="org.mobicents.media.server.EndpointImpl">
- <property name="localName">
- /mobicents/media/cnf/[1..10]
- </property>
- <property name="timer">
- <inject bean="Timer" />
- </property>
-
- <property name="sourceFactory">
- <inject bean="CnfBridgeSource" />
- </property>
-
- <property name="sinkFactory">
- <inject bean="CnfBridgeSink" />
- </property>
-
- <property name="rtpFactory">
- <map class="java.util.Hashtable"
keyClass="java.lang.String"
-
valueClass="org.mobicents.media.server.impl.rtp.RtpFactory">
- <entry>
- <key>audio</key>
- <value>
- <inject bean="RTPAudioFactory"
/>
- </value>
- </entry>
- </map>
- </property>
-
- <property name="txChannelFactory">
- <inject bean="Cnf-Dsp-ChannelFactory" />
- </property>
- <property name="rxChannelFactory">
- <inject bean="Cnf-Dsp-ChannelFactory" />
- </property>
- </bean>
-
- <!-- Conference local bridge -->
- <bean name="CnfEndpoint-local"
- class="org.mobicents.media.server.EndpointImpl">
- <property name="localName">
- /mobicents/media/cnf/local/[1..10]
- </property>
- <property name="timer">
- <inject bean="Timer" />
- </property>
-
- <property name="sourceFactory">
- <inject bean="CnfBridgeSource" />
- </property>
-
- <property name="sinkFactory">
- <inject bean="CnfBridgeSink" />
- </property>
-
- <property name="txChannelFactory">
- <inject bean="Cnf-DefaultChannelFactory" />
- </property>
- <property name="rxChannelFactory">
- <inject bean="Cnf-DefaultChannelFactory" />
- </property>
- </bean>
-
-</deployment>
=======================================
---
/trunk/servers/media/core/server-sar/src/main/config/ann-jboss-beans.xml
Fri Jun 5 08:45:10 2009
+++
/trunk/servers/media/core/server-sar/src/main/config/ann-jboss-beans.xml
Tue Aug 11 23:16:32 2009
@@ -6,6 +6,13 @@
<bean name="Ann-TxChannelFactory"
class="org.mobicents.media.server.resource.ChannelFactory" />
+ <bean name="AnnConnectionFactory"
+ class="org.mobicents.media.server.ConnectionFactory">
+ <property name="txChannelFactory">
+ <inject bean="Ann-TxChannelFactory" />
+ </property>
+ </bean>
+
<!-- ANNOUNCEMENT -->
<bean name="Announcement-Access-Point"
class="org.mobicents.media.server.EndpointImpl">
@@ -29,8 +36,8 @@
</entry>
</map>
</property>
- <property name="txChannelFactory">
- <inject bean="Ann-TxChannelFactory" />
+ <property name="connectionFactory">
+ <inject bean="AnnConnectionFactory" />
</property>
</bean>
=======================================
---
/trunk/servers/media/core/server-sar/src/main/config/ivr-jboss-beans.xml
Fri Jun 5 08:45:10 2009
+++
/trunk/servers/media/core/server-sar/src/main/config/ivr-jboss-beans.xml
Tue Aug 11 23:16:32 2009
@@ -6,7 +6,7 @@
<bean name="IVR-TxChannelFactory"
class="org.mobicents.media.server.resource.ChannelFactory" />
-
+
<bean name="IVR-Pipe-1"
class="org.mobicents.media.server.resource.PipeFactory">
<property name="outlet">audio.processor</property>
@@ -46,6 +46,16 @@
</property>
</bean>
+ <bean name="IVRConnectionFactory"
+ class="org.mobicents.media.server.ConnectionFactory">
+ <property name="txChannelFactory">
+ <inject bean="IVR-TxChannelFactory" />
+ </property>
+ <property name="rxChannelFactory">
+ <inject bean="IVR-RxChannelFactory" />
+ </property>
+ </bean>
+
<!-- IVR -->
<bean name="IVREndpoint"
class="org.mobicents.media.server.EndpointImpl">
@@ -72,11 +82,8 @@
</entry>
</map>
</property>
- <property name="txChannelFactory">
- <inject bean="IVR-TxChannelFactory" />
- </property>
- <property name="rxChannelFactory">
- <inject bean="IVR-RxChannelFactory" />
+ <property name="connectionFactory">
+ <inject bean="IVRConnectionFactory" />
</property>
</bean>
=======================================
---
/trunk/servers/media/core/server-sar/src/main/config/packetrelay-jboss-beans.xml
Fri Jun 5 08:45:10 2009
+++
/trunk/servers/media/core/server-sar/src/main/config/packetrelay-jboss-beans.xml
Tue Aug 11 23:16:32 2009
@@ -47,14 +47,19 @@
</bean>
- <bean name="PacketRelaySourceFactory"
-
class="org.mobicents.media.server.impl.resource.prelay.PacketRelaySourceFactory">
- <property name="name">pr-source</property>
+ <bean name="PacketRelayConnectionFactory"
+ class="org.mobicents.media.server.ConnectionFactory">
+ <property name="txChannelFactory">
+ <inject bean="PR-TxChannelFactory" />
+ </property>
+ <property name="rxChannelFactory">
+ <inject bean="PR-RxChannelFactory" />
+ </property>
</bean>
- <bean name="PacketRelaySinkFactory"
-
class="org.mobicents.media.server.impl.resource.prelay.PacketRelaySinkFactory">
- <property name="name">pr-sink</property>
+ <bean name="PacketRelayBridgeFactory"
+
class="org.mobicents.media.server.impl.resource.prelay.BridgeFactory">
+ <property name="name">packet.relay</property>
</bean>
<bean name="PacketRelayEndpoint"
@@ -76,19 +81,12 @@
</entry>
</map>
</property>
- <property name="txChannelFactory">
- <inject bean="PR-TxChannelFactory" />
+ <property name="connectionFactory">
+ <inject bean="PacketRelayConnectionFactory" />
</property>
- <property name="rxChannelFactory">
- <inject bean="PR-RxChannelFactory" />
+ <property name="groupFactory">
+ <inject bean="PacketRelayBridgeFactory" />
</property>
- <property name="sinkFactory">
- <inject bean="PacketRelaySinkFactory" />
- </property>
- <property name="sourceFactory">
- <inject bean="PacketRelaySourceFactory" />
- </property>
-
</bean>
