Revision: 16124
Author: [email protected]
Date: Thu Dec 30 02:51:30 2010
Log: [No log message]
http://code.google.com/p/mobicents/source/detail?r=16124

Modified:
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java

=======================================
--- /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java Mon Dec 27 22:55:45 2010 +++ /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java Thu Dec 30 02:51:30 2010
@@ -35,7 +35,10 @@
                 return LinkOAMMessages.INVALID_COMMAND;
             }

-            if (firstOption.compareTo("create") == 0) {
+            if(firstOption.compareTo("show") == 0){
+                //Show
+                return this.linksetManager.showLinkset(options);
+            } else if (firstOption.compareTo("create") == 0) {
                 // Create Linkset
                 return this.linksetManager.createLinkset(options);
             } else if (firstOption.compareTo("delete") == 0) {
=======================================
--- /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java Tue Dec 28 23:01:00 2010 +++ /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java Thu Dec 30 02:51:30 2010
@@ -48,8 +48,6 @@
     private String shellAddress = "127.0.0.1";
     private int shellPort = 3435;

-    private LinksetManager linkSetManager = null;
-
     private Logger logger = Logger.getLogger(SS7Service.class);

     @Override
@@ -76,7 +74,7 @@
         logger.info("Starting SS7 management shell environment");
         shell = new ShellExecutor(InetAddress.getByName(this.shellAddress),
                 this.shellPort);
-        shell.setLinksetManager(this.linkSetManager);
+        shell.setLinksetManager(this.linksetManager);
         shell.start();


@@ -96,12 +94,10 @@
     }

     public void setShellPort(int shellPort) {
-        System.out.println("setShellPort called = "+shellPort);
         this.shellPort = shellPort;
     }

     public void setJndiName(String jndiName) {
-        System.out.println("setJndiName called = "+jndiName);
         this.jndiName = jndiName;
     }

=======================================
--- /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java Mon Dec 27 09:30:30 2010 +++ /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java Thu Dec 30 02:51:30 2010
@@ -23,7 +23,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;
@@ -55,14 +55,14 @@
     private String rxMessage = "";
     private String txMessage = "";

-    private LinksetManager linksetManager = null;
+    private volatile LinksetManager linksetManager = null;

     private LinksetListenerImpl linksetListenerImpl = null;

     private volatile boolean started = false;

public ShellExecutor(InetAddress address, int port) throws IOException {
-        provider = ChannelProvider.open();
+        provider = ChannelProvider.provider();
         serverChannel = provider.openServerChannel();
InetSocketAddress inetSocketAddress = new InetSocketAddress(address,
                 port);
@@ -71,15 +71,14 @@
         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));
     }

     public void start() {
-        linksetListenerImpl = new LinksetListenerImpl(this.linksetManager);
-
+ this.linksetListenerImpl = new LinksetListenerImpl(this.linksetManager);
         this.started = true;
         new Thread(this).start();
     }
@@ -92,7 +91,7 @@
         return linksetManager;
     }

-    protected void setLinksetManager(LinksetManager linksetManager) {
+    protected void setLinksetManager(LinksetManager linksetManager) {
         this.linksetManager = linksetManager;
     }

@@ -104,12 +103,12 @@

         while (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();
@@ -118,7 +117,6 @@
                         Message msg = (Message) chan.receive();

                         if (msg != null) {
-                            System.out.println("Receive " + msg);
                             rxMessage = msg.toString();

                             if (rxMessage.compareTo("disconnect") == 0) {
@@ -157,14 +155,14 @@

                         if (this.txMessage.compareTo("Bye") == 0) {
                             this.closeChannel();
-                        }
-
-//                        else {
-//
-// ShellChannel chan = (ShellChannel) key.channel();
-//                            System.out.println("Sending " + txMessage);
-// chan.send(messageFactory.createMessage(txMessage));
-//                        }
+                        }
+
+                        // else {
+                        //
+ // ShellChannel chan = (ShellChannel) key.channel();
+                        // System.out.println("Sending " + txMessage);
+ // chan.send(messageFactory.createMessage(txMessage));
+                        // }

                         this.txMessage = "";
                     }
@@ -198,7 +196,6 @@
         skey.cancel();
         skey = channel.register(selector, SelectionKey.OP_READ
                 | SelectionKey.OP_WRITE);
-        System.out.println("Client connected");
     }

     private void closeChannel() throws IOException {

Reply via email to