2 new revisions:

Revision: 9aad2510bdb7
Author:   [email protected] <[email protected]>
Date:     Fri Aug 10 02:10:11 2012
Log:      Adopted latest SS7 CLI changes
http://code.google.com/p/smscgateway/source/detail?r=9aad2510bdb7

Revision: a60dfed0baa2
Author:   [email protected] <[email protected]>
Date:     Fri Aug 10 02:10:53 2012
Log:      Changed SS7 service name to MAPSS7Service
http://code.google.com/p/smscgateway/source/detail?r=a60dfed0baa2

==============================================================================
Revision: 9aad2510bdb7
Author:   [email protected] <[email protected]>
Date:     Fri Aug 10 02:10:11 2012
Log:      Adopted latest SS7 CLI changes
http://code.google.com/p/smscgateway/source/detail?r=9aad2510bdb7

Modified:
 /core/oam/cli/pom.xml
/core/oam/cli/src/main/java/org/mobicents/ss7/management/console/impl/SmscCommandHandler.java

=======================================
--- /core/oam/cli/pom.xml       Sat Jul  7 10:32:42 2012
+++ /core/oam/cli/pom.xml       Fri Aug 10 02:10:11 2012
@@ -29,6 +29,10 @@
                                
<directory>src/main/resources/archive-files</directory>
                                <targetPath>META-INF/services</targetPath>
                        </resource>
+                       <resource>
+                               <directory>src/main/resources/help</directory>
+                               <targetPath>help</targetPath>
+                       </resource>
                </resources>
        </build>
        <profiles>
=======================================
--- /core/oam/cli/src/main/java/org/mobicents/ss7/management/console/impl/SmscCommandHandler.java Sat Jul 7 02:48:18 2012 +++ /core/oam/cli/src/main/java/org/mobicents/ss7/management/console/impl/SmscCommandHandler.java Fri Aug 10 02:10:11 2012
@@ -1,11 +1,9 @@
 package org.mobicents.ss7.management.console.impl;

-import java.util.ArrayList;
-import java.util.List;
-
 import org.mobicents.ss7.management.console.CommandContext;
 import org.mobicents.ss7.management.console.CommandHandlerWithHelp;
-import org.mobicents.ss7.management.console.CommandLineCompleter;
+import org.mobicents.ss7.management.console.Tree;
+import org.mobicents.ss7.management.console.Tree.Node;

 /**
  * @author amit bhayani
@@ -13,61 +11,20 @@
  */
 public class SmscCommandHandler extends CommandHandlerWithHelp {

-       private final List<CommandLineCompleter> completion;
+       static final Tree commandTree = new Tree("smsc");
+       static {
+               Node parent = commandTree.getTopNode();

-       public SmscCommandHandler() {
-               this.completion = new ArrayList<CommandLineCompleter>();
+               Node esme = parent.addChild("esme");
+               esme.addChild("create");
+               esme.addChild("delete");
+               esme.addChild("show");

-               CommandLineCompleter commandLineCompleter = new 
CommandLineCompleter() {
-                       @Override
- public int complete(CommandContext ctx, String buffer, int cursor, List<String> candidates) {
+       };

-                               if (!ctx.isControllerConnected()) {
-                                       return 0;
-                               }
-                               // very simple completor
- if (buffer.equals("") || buffer.equals("s") || buffer.equals("sm") || buffer.equals("sms")) {
-                                       candidates.add("smsc");
-                               } else if (buffer.equals("smsc") || 
buffer.equals("smsc ")) {
-                                       candidates.add("esme");
-                               } else if (buffer.equals("sccp esme") || 
buffer.equals("sccp esme ")) {
-                                       candidates.add("create");
-                                       candidates.add("delete");
-                                       candidates.add("show");
-                               }
-
-                               return 0;
-                       }
-               };
-
-               this.completion.add(commandLineCompleter);
+       public SmscCommandHandler() {
+               super(commandTree, CONNECT_MANDATORY_FLAG);
        }
-
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * 
org.mobicents.ss7.management.console.CommandHandler#getCompletionList()
-        */
-       @Override
-       public List<CommandLineCompleter> getCommandLineCompleterList() {
-               return this.completion;
-       }
-
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.mobicents.ss7.management.console.CommandHandler#handles(java.lang
-        * .String)
-        */
-       @Override
-       public boolean handles(String command) {
-               if (command.startsWith("smsc")) {
-                       return true;
-               }
-               return false;
-       }

        /*
         * (non-Javadoc)
@@ -79,7 +36,11 @@
        @Override
        public void handle(CommandContext ctx, String commandLine) {
                // TODO Validate command
-               String[] commands = commandLine.split(" ");
+               if (commandLine.contains("--help")) {
+                       this.printHelp(commandLine, ctx);
+                       return;
+               }
+
                ctx.sendMessage(commandLine);
        }


==============================================================================
Revision: a60dfed0baa2
Author:   [email protected] <[email protected]>
Date:     Fri Aug 10 02:10:53 2012
Log:      Changed SS7 service name to MAPSS7Service
http://code.google.com/p/smscgateway/source/detail?r=a60dfed0baa2

Modified:
 /core/bootstrap/src/main/config/META-INF/jboss-beans.xml

=======================================
--- /core/bootstrap/src/main/config/META-INF/jboss-beans.xml Sat Jul 7 02:48:18 2012 +++ /core/bootstrap/src/main/config/META-INF/jboss-beans.xml Fri Aug 10 02:10:53 2012
@@ -142,7 +142,7 @@
<!-- ==================================================================== -->
        <!-- Mobicents SS7 Service -->
<!-- ==================================================================== --> - <bean name="SS7Service" class="org.mobicents.smsc.server.bootstrap.SS7Service"> + <bean name="MAPSS7Service" class="org.mobicents.smsc.server.bootstrap.SS7Service"> <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="org.mobicents.ss7:service=SS7Service",exposedInterface=org.mobicents.smsc.server.bootstrap.SS7ServiceMBean.class,registerDirectly=true)
                </annotation>
                <property name="jndiName">java:/mobicents/ss7/map</property>

Reply via email to