Revision: 002f4d3e2606
Author: [email protected] <[email protected]>
Date: Sat Jul 7 02:48:18 2012
Log: Issue 18: Adapt to new jSS7 CLI
http://code.google.com/p/smscgateway/source/detail?r=002f4d3e2606
Added:
/core/oam/cli/pom.xml
/core/oam/cli/src/main/java/org/mobicents/ss7/management/console/impl/SmscCommandHandler.java
/core/oam/cli/src/main/resources/archive-files/org.mobicents.ss7.management.console.CommandHandler
Deleted:
/core/oam/pom.xml
/core/oam/src/main/java/org/mobicents/smsc/oam/ShellExecutor.java
/core/oam/src/main/java/org/mobicents/smsc/oam/Subject.java
Modified:
/core/bootstrap/pom.xml
/core/bootstrap/src/main/assembly/descriptor.xml
/core/bootstrap/src/main/config/META-INF/jboss-beans.xml
/core/pom.xml
/core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
/test/bootstrap/src/main/assembly/descriptor.xml
/test/bootstrap/src/main/config/oam-beans.xml
/test/bootstrap/src/main/config/ss7/ss7-beans.xml
/test/pom.xml
=======================================
--- /dev/null
+++ /core/oam/cli/pom.xml Sat Jul 7 02:48:18 2012
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.mobicents.smsc</groupId>
+ <artifactId>core</artifactId>
+ <version>1.0.0.ALPHA-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>smsc-cli</artifactId>
+ <name>Core : Operations and Management : CLI</name>
+
+ <dependencies>
+ <!-- <dependency> <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version> </dependency> -->
+ <!-- MTP3 -->
+ <dependency>
+
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ <artifactId>shell</artifactId>
+ <version>${ss7.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
+ <resources>
+ <resource>
+
<directory>src/main/resources/archive-files</directory>
+ <targetPath>META-INF/services</targetPath>
+ </resource>
+ </resources>
+ </build>
+</project>
=======================================
--- /dev/null
+++
/core/oam/cli/src/main/java/org/mobicents/ss7/management/console/impl/SmscCommandHandler.java
Sat Jul 7 02:48:18 2012
@@ -0,0 +1,102 @@
+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;
+
+/**
+ * @author amit bhayani
+ *
+ */
+public class SmscCommandHandler extends CommandHandlerWithHelp {
+
+ private final List<CommandLineCompleter> completion;
+
+ public SmscCommandHandler() {
+ this.completion = new ArrayList<CommandLineCompleter>();
+
+ 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);
+ }
+
+ /*
+ * (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)
+ *
+ * @see
+ * org.mobicents.ss7.management.console.CommandHandler#isValid(java.lang
+ * .String)
+ */
+ @Override
+ public void handle(CommandContext ctx, String commandLine) {
+ // TODO Validate command
+ String[] commands = commandLine.split(" ");
+ ctx.sendMessage(commandLine);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ *
org.mobicents.ss7.management.console.CommandHandler#isAvailable(org.mobicents
+ * .ss7.management.console.CommandContext)
+ */
+ @Override
+ public boolean isAvailable(CommandContext ctx) {
+ if (!ctx.isControllerConnected()) {
+ ctx.printLine("The command is not available in the current context.
Please connnect first");
+ return false;
+ }
+ return true;
+ }
+
+}
=======================================
--- /dev/null
+++
/core/oam/cli/src/main/resources/archive-files/org.mobicents.ss7.management.console.CommandHandler
Sat Jul 7 02:48:18 2012
@@ -0,0 +1,1 @@
+org.mobicents.ss7.management.console.impl.SmscCommandHandler
=======================================
--- /core/oam/pom.xml Sat Apr 28 23:38:02 2012
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
-
- <parent>
- <groupId>org.mobicents.smsc</groupId>
- <artifactId>core</artifactId>
- <version>1.0.0.ALPHA-SNAPSHOT</version>
- </parent>
-
- <artifactId>oam</artifactId>
- <name>Core : Operations and Management</name>
-
- <dependencies>
- <!-- SMSC SMPP -->
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>smpp</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <!-- javolution -->
- <dependency>
- <groupId>javolution</groupId>
- <artifactId>javolution</artifactId>
- <version>${javolution.version}</version>
- </dependency>
- <!-- Management Shell -->
- <dependency>
- <artifactId>shell</artifactId>
-
<groupId>org.mobicents.protocols.ss7.management</groupId>
- <version>${ss7.version}</version>
- </dependency>
- <!-- Management linkset -->
- <dependency>
- <artifactId>linkset</artifactId>
-
<groupId>org.mobicents.protocols.ss7.management</groupId>
- <version>${ss7.version}</version>
- </dependency>
- <!-- M3UA -->
- <dependency>
- <artifactId>m3ua-impl</artifactId>
- <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
- <version>${ss7.version}</version>
- </dependency>
- <!-- SCCP -->
- <dependency>
- <artifactId>sccp-impl</artifactId>
- <groupId>org.mobicents.protocols.ss7.sccp</groupId>
- <version>${ss7.version}</version>
- </dependency>
- </dependencies>
-</project>
=======================================
--- /core/oam/src/main/java/org/mobicents/smsc/oam/ShellExecutor.java Sat
Apr 28 23:38:02 2012
+++ /dev/null
@@ -1,275 +0,0 @@
-package org.mobicents.smsc.oam;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.channels.SelectionKey;
-
-import javolution.util.FastSet;
-
-import org.apache.log4j.Logger;
-import org.mobicents.protocols.ss7.m3ua.impl.oam.M3UAShellExecutor;
-import org.mobicents.protocols.ss7.sccp.impl.oam.SccpExecutor;
-import org.mobicents.smsc.smpp.SMSCShellExecutor;
-import org.mobicents.ss7.linkset.oam.LinksetExecutor;
-import org.mobicents.ss7.management.transceiver.ChannelProvider;
-import org.mobicents.ss7.management.transceiver.ChannelSelectionKey;
-import org.mobicents.ss7.management.transceiver.ChannelSelector;
-import org.mobicents.ss7.management.transceiver.Message;
-import org.mobicents.ss7.management.transceiver.MessageFactory;
-import org.mobicents.ss7.management.transceiver.ShellChannel;
-import org.mobicents.ss7.management.transceiver.ShellServerChannel;
-
-/**
- * @author amit bhayani
- */
-public class ShellExecutor implements Runnable {
-
- Logger logger = Logger.getLogger(ShellExecutor.class);
-
- private ChannelProvider provider;
- private ShellServerChannel serverChannel;
- private ShellChannel channel;
- private ChannelSelector selector;
- private ChannelSelectionKey skey;
-
- private MessageFactory messageFactory = null;
-
- private String rxMessage = "";
- private String txMessage = "";
-
- private volatile boolean started = false;
-
- private String address;
-
- private int port;
-
- private volatile LinksetExecutor linksetExecutor = null;
-
- private volatile M3UAShellExecutor m3UAShellExecutor = null;
-
- private volatile SccpExecutor sccpExecutor = null;
-
- private volatile SMSCShellExecutor sMSCShellExecutor = null;
-
- public ShellExecutor() throws IOException {
-
- }
-
- public SccpExecutor getSccpExecutor() {
- return sccpExecutor;
- }
-
- public void setSccpExecutor(SccpExecutor sccpExecutor) {
- this.sccpExecutor = sccpExecutor;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public void start() throws IOException {
- logger.info("Starting SS7 management shell environment");
- provider = ChannelProvider.provider();
- serverChannel = provider.openServerChannel();
- InetSocketAddress inetSocketAddress = new InetSocketAddress(address,
port);
- serverChannel.bind(inetSocketAddress);
-
- selector = provider.openSelector();
- skey = serverChannel.register(selector, SelectionKey.OP_ACCEPT);
-
- messageFactory = ChannelProvider.provider().getMessageFactory();
-
- this.logger.info(String.format("ShellExecutor listening at %s",
inetSocketAddress));
-
- this.started = true;
- new Thread(this).start();
- }
-
- public void stop() {
- this.started = false;
- }
-
- public LinksetExecutor getLinksetExecutor() {
- return linksetExecutor;
- }
-
- public void setLinksetExecutor(LinksetExecutor linksetExecutor) {
- this.linksetExecutor = linksetExecutor;
- }
-
- public M3UAShellExecutor getM3UAShellExecutor() {
- return m3UAShellExecutor;
- }
-
- public void setM3UAShellExecutor(M3UAShellExecutor shellExecutor) {
- m3UAShellExecutor = shellExecutor;
- }
-
- public SMSCShellExecutor getsMSCShellExecutor() {
- return sMSCShellExecutor;
- }
-
- public void setsMSCShellExecutor(SMSCShellExecutor sMSCShellExecutor) {
- this.sMSCShellExecutor = sMSCShellExecutor;
- }
-
- public void run() {
-
- while (started) {
- try {
- 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();
- } else if (key.isReadable()) {
- ShellChannel chan =
(ShellChannel) key.channel();
- Message msg = (Message)
chan.receive();
-
- if (msg != null) {
- rxMessage =
msg.toString();
- System.out.println("received
" + rxMessage);
- if
(rxMessage.compareTo("disconnect") == 0) {
- this.txMessage =
"Bye";
-
chan.send(messageFactory.createMessage(txMessage));
-
- } else {
- String[] options =
rxMessage.split(" ");
- Subject subject
= Subject.getSubject(options[0]);
- if (subject ==
null) {
-
chan.send(messageFactory.createMessage("Invalid Subject"));
- } else {
- //
Nullify examined options
- //
options[0] = null;
-
- switch
(subject) {
- case
LINKSET:
-
if (this.linksetExecutor == null) {
-
this.txMessage = "Error! LinksetExecutor is null";
-
} else {
-
this.txMessage = this.linksetExecutor.execute(options);
-
}
-
break;
- case
SCTP:
- case
M3UA:
-
if (this.m3UAShellExecutor == null) {
-
this.txMessage = "Error! M3UAShellExecutor is null";
-
} else {
-
this.txMessage = this.m3UAShellExecutor.execute(options);
-
}
-
break;
- case
SCCP:
-
if (this.sccpExecutor == null) {
-
this.txMessage = "Error! SccpExecutor is null";
-
} else {
-
this.txMessage = this.sccpExecutor.execute(options);
-
}
-
break;
- case
SMSC:
-
if (this.sMSCShellExecutor == null) {
-
this.txMessage = "Error! SMSCShellExecutor is null";
-
} else {
-
this.txMessage = this.sMSCShellExecutor.execute(options);
-
}
-
break;
- default:
-
this.txMessage = "Invalid Subject";
-
break;
- }
-
chan.send(messageFactory.createMessage(this.txMessage));
- }
- } // if
(rxMessage.compareTo("disconnect")
- } // if (msg != null)
-
- // TODO Handle message
-
- rxMessage = "";
-
- } else if (key.isWritable() &&
txMessage.length() > 0) {
-
- if
(this.txMessage.compareTo("Bye") == 0) {
- this.closeChannel();
- }
-
- // else {
- //
- // ShellChannel chan =
(ShellChannel) key.channel();
- // System.out.println("Sending
" + txMessage);
- //
chan.send(messageFactory.createMessage(txMessage));
- // }
-
- this.txMessage = "";
- }
- }
- } catch (IOException e) {
- logger.error(
- "IO Exception while operating on ChannelSelectionKey. Client CLI
connection will be closed now",
- e);
- try {
- this.closeChannel();
- } catch (IOException e1) {
- logger.error("IO Exception while closing
Channel", e);
- }
- } catch (Exception e) {
- logger.error(
- "Exception while operating on ChannelSelectionKey. Client CLI
connection will be closed now", e);
- try {
- this.closeChannel();
- } catch (IOException e1) {
- logger.error("IO Exception while closing
Channel", e);
- }
- }
-
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- }
- }
-
- try {
- skey.cancel();
- if (channel != null) {
- channel.close();
- }
- serverChannel.close();
- selector.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- this.logger.info("Stopped ShellExecutor service");
- }
-
- private void accept() throws IOException {
- channel = serverChannel.accept();
- skey.cancel();
- skey = channel.register(selector, SelectionKey.OP_READ |
SelectionKey.OP_WRITE);
- }
-
- private void closeChannel() throws IOException {
- if (channel != null) {
- try {
- this.channel.close();
- } catch (IOException e) {
- logger.error("Error closing channel", e);
- }
- }
- skey.cancel();
- skey = serverChannel.register(selector, SelectionKey.OP_ACCEPT);
- }
-
-}
=======================================
--- /core/oam/src/main/java/org/mobicents/smsc/oam/Subject.java Sat Apr 28
23:38:02 2012
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.mobicents.smsc.oam;
-
-/**
- * Represents the Subject of command formated as "subject <options>".
- *
- * @author zaheer abbas
- *
- */
-public enum Subject {
-
- /**
- * linkset subject. Any command to manipulate the linkset, should begin
with
- * linkset subject
- */
- LINKSET("linkset"),
-
- SCCP("sccp"),
- /**
- * M3UA Subject. Any command to manage the M3UA should begin with m3ua
- * subject
- */
- M3UA("m3ua"),
-
- SCTP("sctp"),
-
- /**
- * SMSC Subject. Any command to manage the SMSC should begin with smsc
- * subject
- */
- SMSC("smsc");
-
- private String subject = null;
-
- private Subject(String subject) {
- this.subject = subject;
- }
-
- /**
- * get the string representation of this subject enum
- *
- * @return
- */
- public String getSubject() {
- return subject;
- }
-
- /**
- * get the corresponding enum for passed subject String. Returns null if
- * there is no subject enum defined for passed subject string
- *
- * @param subject
- * @return
- */
- public static Subject getSubject(String subject) {
- if (subject.equals(LINKSET.getSubject())) {
- return LINKSET;
- } else if (subject.equals(M3UA.getSubject())) {
- return M3UA;
- } else if (subject.equals(SCCP.getSubject())) {
- return SCCP;
- } else if (subject.equals(SCTP.getSubject())) {
- return SCTP;
- }else if (subject.equals(SMSC.getSubject())) {
- return SMSC;
- }
- return null;
- }
-}
-
=======================================
--- /core/bootstrap/pom.xml Thu Apr 26 01:25:46 2012
+++ /core/bootstrap/pom.xml Sat Jul 7 02:48:18 2012
@@ -84,6 +84,14 @@
<artifactId>clock</artifactId>
<version>${ss7.version}</version>
</dependency>
+
+ <!-- Scheduler -->
+ <dependency>
+ <artifactId>scheduler</artifactId>
+ <groupId>org.mobicents.protocols.ss7.scheduler</groupId>
+ <version>${ss7.version}</version>
+ </dependency>
+
<!-- Management Shell -->
<dependency>
<artifactId>shell</artifactId>
@@ -94,9 +102,7 @@
<!-- Management linkset -->
<dependency>
<artifactId>linkset</artifactId>
- <groupId>
- org.mobicents.protocols.ss7.management
- </groupId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
<version>${ss7.version}</version>
</dependency>
@@ -142,7 +148,7 @@
<groupId>org.mobicents.protocols.ss7.sccp</groupId>
<version>${ss7.version}</version>
</dependency>
-
+
<!-- MAP -->
<dependency>
<artifactId>map-api</artifactId>
@@ -166,7 +172,7 @@
<groupId>org.mobicents.protocols.ss7.tcap</groupId>
<version>${ss7.version}</version>
</dependency>
-
+
<!-- ISUP -->
<dependency>
<artifactId>isup-api</artifactId>
@@ -177,8 +183,8 @@
<artifactId>isup-impl</artifactId>
<groupId>org.mobicents.protocols.ss7.isup</groupId>
<version>${ss7.version}</version>
- </dependency>
-
+ </dependency>
+
</dependencies>
<!-- -->
@@ -231,7 +237,8 @@
</fileset>
</copy>
- <copy file="${basedir}/src/main/config/smsc.properties"
tofile="${jboss.home}/server/${node}/conf/smsc.properties">
+ <copy
file="${basedir}/src/main/config/smsc.properties"
+
tofile="${jboss.home}/server/${node}/conf/smsc.properties">
</copy>
</tasks>
</configuration>
@@ -248,7 +255,7 @@
<fileset
dir="${jboss.home}/server/${node}/deploy/mobicents-smsc-server"
/>
</delete>
- <delete
file="${jboss.home}/server/${node}/conf/smsc.properties"/>
+ <delete
file="${jboss.home}/server/${node}/conf/smsc.properties" />
</tasks>
</configuration>
</execution>
=======================================
--- /core/bootstrap/src/main/assembly/descriptor.xml Thu Apr 26 01:25:46
2012
+++ /core/bootstrap/src/main/assembly/descriptor.xml Sat Jul 7 02:48:18
2012
@@ -16,7 +16,6 @@
<includes>
<!-- SMSC libraris -->
<include>org.mobicents.smsc:bootstrap</include>
- <include>org.mobicents.smsc:oam</include>
<include>org.mobicents.smsc:smpp</include>
<!-- cloudhopper library -->
@@ -36,6 +35,7 @@
<include>org.mobicents.protocols.asn:asn</include>
<!-- SS7 Libraries -->
+
<include>org.mobicents.protocols.ss7.scheduler:scheduler</include>
<include>org.mobicents.protocols.ss7.sccp:sccp-api</include>
<include>org.mobicents.protocols.ss7.sccp:sccp-impl</include>
<include>org.mobicents.protocols.ss7.isup:isup-api</include>
@@ -49,7 +49,7 @@
<include>org.mobicents.protocols.ss7.mtp:mtp</include>
<include>org.mobicents.protocols.ss7.mtp:mtp-api</include>
<include>org.mobicents.protocols.ss7.management:shell</include>
-
<include>org.mobicents.protocols.ss7.management:linkset</include>
+
<include>org.mobicents.protocols.ss7.hardware:linkset</include>
<!--
<include>org.mobicents.protocols.ss7.hardware:mobicents-dahdi</include> -->
<include>org.mobicents.protocols.ss7.hardware:mobicents-dialogic</include>
<include>org.mobicents.protocols.ss7.congestion:congestion</include>
=======================================
--- /core/bootstrap/src/main/config/META-INF/jboss-beans.xml Tue May 8
08:35:43 2012
+++ /core/bootstrap/src/main/config/META-INF/jboss-beans.xml Sat Jul 7
02:48:18 2012
@@ -12,6 +12,12 @@
<property name="connectDelay">30000</property>
</bean>
+ <bean name="SCTPShellExecutor"
+
class="org.mobicents.protocols.ss7.m3ua.impl.oam.SCTPShellExecutor">
+ <property name="sctpManagement">
+ <inject bean="SCTPManagement" />
+ </property>
+ </bean>
<!-- ====================================================================
-->
<!-- M3UA -->
<!-- M3UAManagement is managing the m3ua side commands -->
@@ -33,10 +39,21 @@
<property name="m3uaManagement">
<inject bean="Mtp3UserPart" />
</property>
- <property name="sctpManagement">
- <inject bean="SCTPManagement" />
- </property>
</bean>
+
+ <!-- ====================================================================
-->
+ <!-- Scheduler -->
+ <!-- Scheduler for ss7 stack -->
+ <!-- ====================================================================
-->
+ <!-- -->
+ <bean name="SS7Clock"
class="org.mobicents.protocols.ss7.scheduler.DefaultClock">
+ </bean>
+
+ <bean name="SS7Scheduler"
class="org.mobicents.protocols.ss7.scheduler.Scheduler">
+ <property name="clock">
+ <inject bean="SS7Clock" />
+ </property>
+ </bean>
<!-- ====================================================================
-->
<!-- Dialogic Mtp3UserPart -->
@@ -103,20 +120,23 @@
<!-- Shell Service -->
<!-- ====================================================================
-->
<!-- Define Shell Executor -->
- <bean name="ShellExecutor" class="org.mobicents.smsc.oam.ShellExecutor">
+ <bean name="ShellExecutor"
class="org.mobicents.ss7.management.console.ShellServer">
+ <constructor>
+ <parameter>
+ <inject bean="SS7Scheduler" />
+ </parameter>
+ <parameter>
+ <list class="javolution.util.FastList"
elementClass="org.mobicents.ss7.management.console.ShellExecutor">
+ <inject bean="SccpExecutor" />
+ <inject bean="M3UAShellExecutor" />
+ <inject bean="SCTPShellExecutor" />
+ <inject bean="SMSCShellExecutor" />
+ </list>
+ </parameter>
+ </constructor>
+
<property name="address">${jboss.bind.address}</property>
<property name="port">3435</property>
-
- <property name="sccpExecutor">
- <inject bean="SccpExecutor" />
- </property>
- <property name="m3UAShellExecutor">
- <inject bean="M3UAShellExecutor" />
- </property>
-
- <property name="sMSCShellExecutor">
- <inject bean="SMSCShellExecutor" />
- </property>
</bean>
<!-- ====================================================================
-->
=======================================
--- /core/pom.xml Thu Apr 26 01:25:46 2012
+++ /core/pom.xml Sat Jul 7 02:48:18 2012
@@ -15,7 +15,7 @@
<modules>
<module>smpp</module>
- <module>oam</module>
+ <module>oam/cli</module>
<module>slee</module>
<module>bootstrap</module>
</modules>
=======================================
--- /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Sat Apr 28 23:38:02 2012
+++ /core/smpp/src/main/java/org/mobicents/smsc/smpp/SMSCShellExecutor.java
Sat Jul 7 02:48:18 2012
@@ -30,7 +30,7 @@
import org.mobicents.ss7.management.console.ShellExecutor;
/**
- *
+ * @author amit bhayani
* @author zaheer abbas
*
*/
@@ -192,7 +192,7 @@
if (rasCmd.equals("create")) {
return this.createEsme(args);
- } else if (rasCmd.equals("destroy")) {
+ } else if (rasCmd.equals("delete")) {
return this.destroyEsme(args);
} else if (rasCmd.equals("show")) {
return this.showEsme();
@@ -269,5 +269,10 @@
}
return SMSCOAMMessages.INVALID_COMMAND;
}
+
+ @Override
+ public boolean handles(String command) {
+ return "sccp".equals(command);
+ }
}
=======================================
--- /test/bootstrap/src/main/assembly/descriptor.xml Thu Apr 26 01:25:46
2012
+++ /test/bootstrap/src/main/assembly/descriptor.xml Sat Jul 7 02:48:18
2012
@@ -70,6 +70,7 @@
<include>org.mobicents.protocols.asn:asn</include>
<!-- SS7 Libraries -->
+
<include>org.mobicents.protocols.ss7.scheduler:scheduler</include>
<include>org.mobicents.protocols.ss7.sccp:sccp-api</include>
<include>org.mobicents.protocols.ss7.sccp:sccp-impl</include>
<include>org.mobicents.protocols.ss7.tcap:tcap-api</include>
@@ -80,7 +81,7 @@
<include>org.mobicents.protocols.ss7.m3ua:m3ua-impl</include>
<include>org.mobicents.protocols.ss7.mtp:mtp</include>
<include>org.mobicents.protocols.ss7.mtp:mtp-api</include>
-
<include>org.mobicents.protocols.ss7.management:linkset</include>
+
<include>org.mobicents.protocols.ss7.hardware:linkset</include>
<include>org.mobicents.protocols.ss7.management:shell</include>
<!--
<include>org.mobicents.protocols.ss7.hardware:mobicents-dahdi</include> -->
<include>org.mobicents.protocols.ss7.hardware:mobicents-dialogic
=======================================
--- /test/bootstrap/src/main/config/oam-beans.xml Thu Apr 26 04:08:57 2012
+++ /test/bootstrap/src/main/config/oam-beans.xml Sat Jul 7 02:48:18 2012
@@ -6,15 +6,22 @@
<!-- Shell Service -->
<!-- ====================================================================
-->
<!-- Define Shell Executor -->
- <bean name="ShellExecutor"
class="org.mobicents.smsc.oam.TestShellExecutor">
+ <bean name="ShellExecutor"
class="org.mobicents.ss7.management.console.ShellServer">
+ <constructor>
+ <parameter>
+ <inject bean="SS7Scheduler" />
+ </parameter>
+ <parameter>
+ <list class="javolution.util.FastList"
+
elementClass="org.mobicents.ss7.management.console.ShellExecutor">
+ <inject bean="SccpExecutor" />
+ <inject bean="M3UAShellExecutor" />
+ <inject bean="SCTPShellExecutor" />
+ </list>
+ </parameter>
+ </constructor>
+
<property name="address">${smsc.bind.address}</property>
<property name="port">3436</property>
-
- <property name="sccpExecutor">
- <inject bean="SccpExecutor" />
- </property>
- <property name="m3UAShellExecutor">
- <inject bean="M3UAShellExecutor" />
- </property>
</bean>
</deployment>
=======================================
--- /test/bootstrap/src/main/config/ss7/ss7-beans.xml Thu Apr 26 01:25:46
2012
+++ /test/bootstrap/src/main/config/ss7/ss7-beans.xml Sat Jul 7 02:48:18
2012
@@ -11,6 +11,13 @@
<property name="singleThread">true</property>
<property name="connectDelay">30000</property>
</bean>
+
+ <bean name="SCTPShellExecutor"
+
class="org.mobicents.protocols.ss7.m3ua.impl.oam.SCTPShellExecutor">
+ <property name="sctpManagement">
+ <inject bean="SCTPManagement" />
+ </property>
+ </bean>
<!-- ====================================================================
-->
<!-- M3UA -->
@@ -32,10 +39,21 @@
<property name="m3uaManagement">
<inject bean="Mtp3UserPart" />
</property>
- <property name="sctpManagement">
- <inject bean="SCTPManagement" />
- </property>
</bean>
+
+ <!-- ====================================================================
-->
+ <!-- Scheduler -->
+ <!-- Scheduler for ss7 stack -->
+ <!-- ====================================================================
-->
+ <!-- -->
+ <bean name="SS7Clock"
class="org.mobicents.protocols.ss7.scheduler.DefaultClock">
+ </bean>
+
+ <bean name="SS7Scheduler"
class="org.mobicents.protocols.ss7.scheduler.Scheduler">
+ <property name="clock">
+ <inject bean="SS7Clock" />
+ </property>
+ </bean>
<!-- ====================================================================
-->
<!-- Dialogic Mtp3UserPart -->
=======================================
--- /test/pom.xml Thu Apr 26 01:25:46 2012
+++ /test/pom.xml Sat Jul 7 02:48:18 2012
@@ -66,10 +66,10 @@
<version>${ss7.version}</version>
</dependency>
- <!-- Clock -->
+ <!-- Scheduler -->
<dependency>
- <groupId>org.mobicents.protocols.ss7.clock</groupId>
- <artifactId>clock</artifactId>
+ <groupId>org.mobicents.protocols.ss7.scheduler</groupId>
+ <artifactId>scheduler</artifactId>
<version>${ss7.version}</version>
</dependency>
<!-- Management Shell -->
@@ -82,7 +82,7 @@
<!-- Management linkset -->
<dependency>
<artifactId>linkset</artifactId>
-
<groupId>org.mobicents.protocols.ss7.management</groupId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
<version>${ss7.version}</version>
</dependency>