Revision: 16111
Author: [email protected]
Date: Wed Dec 29 19:39:06 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16111

Modified:
 /trunk/servers/media/core/.classpath
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/ShellExecutor.java

=======================================
--- /trunk/servers/media/core/.classpath        Wed Dec 29 04:14:21 2010
+++ /trunk/servers/media/core/.classpath        Wed Dec 29 19:39:06 2010
@@ -1,73 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="server-impl/src/main/java"/>
-  <classpathentry kind="src" path="server-impl/src/test/java"/>
-  <classpathentry kind="src" path="server-impl/src/main/resources"/>
-  <classpathentry kind="src" path="server-standalone/src/test/java"/>
-  <classpathentry kind="src" path="server-standalone/src/main/resources"/>
-  <classpathentry kind="src" path="server-standalone/src/main/java"/>
-  <classpathentry kind="src" path="server-spi/src/main/java"/>
-  <classpathentry kind="src" path="docs/sources-jbcp/src/main/resources"/>
- <classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/> - <classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/>
-  <classpathentry kind="src" path="docs/sources-jbcp/src/main/resources"/>
-  <classpathentry kind="src" path="controllers/mgcp/src/test/java"/>
-  <classpathentry kind="src" path="controllers/mgcp/src/main/java"/>
-  <classpathentry kind="src" path="controllers/rtsp/src/test/java"/>
-  <classpathentry kind="src" path="controllers/rtsp/src/main/java"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/> - <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> - <classpathentry kind="var" path="M2_REPO/jain/jain-mgcp-ri/1.0/jain-mgcp-ri-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/sip/jain-sip-ri/1.2.139/jain-sip-ri-1.2.139.jar"/> - <classpathentry kind="var" path="M2_REPO/javolution/javolution/5.5.1/javolution-5.5.1.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> - <classpathentry kind="var" path="M2_REPO/net/java/stun4j/stun4j/1.0.MOBICENTS/stun4j-1.0.MOBICENTS.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.5.GA/jboss-test-1.0.5.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.2.0.M2/jboss-aop-mc-int-2.2.0.M2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.2.0.M2/jboss-dependency-2.2.0.M2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.2.0.M2/jboss-kernel-2.2.0.M2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/netty/netty/3.2.0.BETA1/netty-3.2.0.BETA1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmu_time_awb/1.2.2/cmu_time_awb-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmu_us_kal/1.2.2/cmu_us_kal-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmudict04/1.2.2/cmudict04-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmulex/1.2.2/cmulex-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmutimelex/1.2.2/cmutimelex-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/en_us/1.2.2/en_us-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/freetts/1.2.2/freetts-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/mbrola/1.2.2/mbrola-1.2.2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/jspeex/jspeex/0.9.7/jspeex-0.9.7.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/tritonus/tritonus_gsm/0.3.6/tritonus_gsm-0.3.6.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/external/tritonus/tritonus_share/0.3.6/tritonus_share-0.3.6.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/mgcp/mgcp-impl/2.0.0.GA/mgcp-impl-2.0.0.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/hardware/mobicents-dahdi/1.0.0-SNAPSHOT/mobicents-dahdi-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-api/1.0.0-SNAPSHOT/m3ua-api-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-impl/1.0.0-SNAPSHOT/m3ua-impl-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/linkset/1.0.0-SNAPSHOT/linkset-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/shell/1.0.0-SNAPSHOT/shell-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/mtp/mtp/1.0.0-SNAPSHOT/mtp-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/stream/stream/1.0.0-SNAPSHOT/stream-1.0.0-SNAPSHOT.jar"/> - <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/> - <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="src" path="server-impl/src/main/java"/>
+       <classpathentry kind="src" path="server-impl/src/test/java"/>
+       <classpathentry kind="src" path="server-impl/src/main/resources"/>
+       <classpathentry kind="src" path="server-standalone/src/test/java"/>
+       <classpathentry kind="src" path="server-standalone/src/main/resources"/>
+       <classpathentry kind="src" path="server-standalone/src/main/java"/>
+       <classpathentry kind="src" path="server-spi/src/main/java"/>
+       <classpathentry kind="src" path="controllers/mgcp/src/test/java"/>
+       <classpathentry kind="src" path="controllers/mgcp/src/main/java"/>
+       <classpathentry kind="src" path="controllers/rtsp/src/test/java"/>
+       <classpathentry kind="src" path="controllers/rtsp/src/main/java"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/> + <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/> + <classpathentry kind="var" path="M2_REPO/jain/jain-mgcp-ri/1.0/jain-mgcp-ri-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/sip/jain-sip-ri/1.2.139/jain-sip-ri-1.2.139.jar"/> + <classpathentry kind="var" path="M2_REPO/javolution/javolution/5.5.1/javolution-5.5.1.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+       <classpathentry kind="var" 
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/> + <classpathentry kind="var" path="M2_REPO/net/java/stun4j/stun4j/1.0.MOBICENTS/stun4j-1.0.MOBICENTS.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.SP1/jboss-aop-2.0.0.SP1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.13.GA/jboss-common-core-2.2.13.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.5.GA/jboss-test-1.0.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.2.0.M2/jboss-aop-mc-int-2.2.0.M2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.2.0.M2/jboss-dependency-2.2.0.M2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.2.0.M2/jboss-kernel-2.2.0.M2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/netty/netty/3.2.0.BETA1/netty-3.2.0.BETA1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmu_time_awb/1.2.2/cmu_time_awb-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmu_us_kal/1.2.2/cmu_us_kal-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmudict04/1.2.2/cmudict04-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmulex/1.2.2/cmulex-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/cmutimelex/1.2.2/cmutimelex-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/en_us/1.2.2/en_us-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/freetts/1.2.2/freetts-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/freetts/mbrola/1.2.2/mbrola-1.2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/jspeex/jspeex/0.9.7/jspeex-0.9.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/tritonus/tritonus_gsm/0.3.6/tritonus_gsm-0.3.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/external/tritonus/tritonus_share/0.3.6/tritonus_share-0.3.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/mgcp/mgcp-impl/2.0.0.GA/mgcp-impl-2.0.0.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/hardware/mobicents-dahdi/1.0.0-SNAPSHOT/mobicents-dahdi-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-api/1.0.0-SNAPSHOT/m3ua-api-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-impl/1.0.0-SNAPSHOT/m3ua-impl-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/linkset/1.0.0-SNAPSHOT/linkset-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/management/shell/1.0.0-SNAPSHOT/shell-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/ss7/mtp/mtp/1.0.0-SNAPSHOT/mtp-1.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/mobicents/protocols/stream/stream/1.0.0-SNAPSHOT/stream-1.0.0-SNAPSHOT.jar"/>
+       <classpathentry kind="var" 
path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/urbanophile/java-getopt/1.0.9/java-getopt-1.0.9.jar"/> + <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>
=======================================
--- /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/ShellExecutor.java Wed Dec 29 04:14:21 2010 +++ /trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/ss7/ShellExecutor.java Wed Dec 29 19:39:06 2010
@@ -4,7 +4,7 @@
 import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;

-import javolution.util.FastList;
+import javolution.util.FastSet;

 import org.apache.log4j.Logger;
 import org.mobicents.ss7.linkset.oam.LinksetManager;
@@ -73,7 +73,7 @@
        public void start() throws IOException {
                linksetListenerImpl = new 
LinksetListenerImpl(this.linksetManager);

-               provider = ChannelProvider.open();
+               provider = ChannelProvider.provider();
                serverChannel = provider.openServerChannel();
                InetSocketAddress inetSocketAddress = new 
InetSocketAddress(address,
                                port);
@@ -82,7 +82,7 @@
                selector = provider.openSelector();
                skey = serverChannel.register(selector, SelectionKey.OP_ACCEPT);

-               messageFactory = new MessageFactory();
+               messageFactory = ChannelProvider.provider().getMessageFactory();

                this.logger.info(String.format("ShellExecutor listening at %s",
                                inetSocketAddress));
@@ -109,12 +109,12 @@

                if (started) {
                        try {
-                               FastList<ChannelSelectionKey> keys = 
selector.selectNow();
-
-                               for (FastList.Node<ChannelSelectionKey> n = 
keys.head(), end = keys
-                                               .tail(); (n = n.getNext()) != 
end;) {
-
-                                       ChannelSelectionKey key = n.getValue();
+                      FastSet<ChannelSelectionKey> keys = selector.selectNow();
+
+ for (FastSet.Record record = keys.head(), end = keys.tail(); (record = record
+                               .getNext()) != end;) {
+                           ChannelSelectionKey key = (ChannelSelectionKey) keys
+                                   .valueOf(record);

                                        if (key.isAcceptable()) {
                                                accept();

Reply via email to