Revision: 16059
Author: [email protected]
Date: Mon Dec 27 00:10:16 2010
Log: Implemented LinksetListener
http://code.google.com/p/mobicents/source/detail?r=16059
Added:
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java
Modified:
/trunk/protocols/ss7/service/src/main/config/jboss-beans.xml
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
=======================================
--- /dev/null
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/LinksetListenerImpl.java
Mon Dec 27 00:10:16 2010
@@ -0,0 +1,34 @@
+package org.mobicents.ss7;
+
+import org.mobicents.protocols.ss7.management.console.LinksetListener;
+import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
+
+public class LinksetListenerImpl implements LinksetListener {
+
+ private LinksetManager linksetManager = null;
+
+ protected LinksetListenerImpl(LinksetManager linksetManager) {
+ this.linksetManager = linksetManager;
+ }
+
+ public String execute(String[] options) {
+
+ String firstOption = null;
+ int i = 0;
+ while (i < options.length && (firstOption = options[i]) == null) {
+ i++;
+ }
+
+ if (firstOption == null) {
+ return "Invalid Command";
+ }
+
+ if (firstOption.compareTo("create") == 0) {
+ options[i] = null;
+ return this.linksetManager.createLinkset(options);
+ }
+
+ return "Invalid Command";
+ }
+
+}
=======================================
--- /trunk/protocols/ss7/service/src/main/config/jboss-beans.xml Fri Dec 24
21:09:53 2010
+++ /trunk/protocols/ss7/service/src/main/config/jboss-beans.xml Mon Dec 27
00:10:16 2010
@@ -2,16 +2,66 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="DahdiLinksetFactory"
+ class="org.mobicents.protocols.ss7.mtp.oam.DahdiLinksetFactory">
+ </bean>
+
+ <bean name="DialogicLinksetFactory"
+
class="org.mobicents.protocols.ss7.mtp.oam.DialogicLinksetFactory">
+ </bean>
+
+ <bean name="M3UALinksetFactory"
+ class="org.mobicents.protocols.ss7.mtp.oam.M3UALinksetFactory">
+ </bean>
+
+ <bean name="LinksetFactoryFactory"
+
class="org.mobicents.protocols.ss7.mtp.oam.LinksetFactoryFactory">
+ <property name="linksetFactories">
+
+ <map keyClass="java.lang.String"
+
valueClass="org.mobicents.protocols.ss7.mtp.oam.LinksetFactory">
+ <entry>
+ <key>dahdi</key>
+ <value>
+ <inject bean="DahdiLinksetFactory"
/>
+ </value>
+ </entry>
+ <entry>
+ <key>dialogic</key>
+ <value>
+ <inject
bean="DialogicLinksetFactory" />
+ </value>
+ </entry>
+ <entry>
+ <key>m3ua</key>
+ <value>
+ <inject bean="M3UALinksetFactory"
/>
+ </value>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+ <bean name="LinksetManager"
+ class="org.mobicents.protocols.ss7.mtp.oam.LinksetManager">
+
+ <property name="linksetFactoryFactory">
+ <inject bean="LinksetFactoryFactory" />
+ </property>
+ <property name="persistDir">${jboss.server.data.dir}</property>
+ </bean>
+
<!-- Mobicents SS7 service -->
<bean name="SS7Service" class="org.mobicents.ss7.SS7Service">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="org.mobicents.ss7:service=SS7Service",exposedInterface=org.mobicents.ss7.SS7ServiceMBean.class,registerDirectly=true)</annotation>
-
<property name="jndiName">java:/mobicents/ss7/sccp</property>
<property name="configPath">
${catalina.home}/deploy/mobicents-ss7-service/sccp-routing.txt
</property>
<property name="shellAddress">${jboss.bind.address}</property>
<property name="shellPort">3435</property>
+ <property name="linkSetManager">
+ <inject bean="LinksetManager" />
+ </property>
</bean>
-
</deployment>
=======================================
---
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
Fri Dec 24 21:44:18 2010
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java
Mon Dec 27 00:10:16 2010
@@ -44,6 +44,8 @@
private String shellAddress = "127.0.0.1";
private int shellPort = 3435;
+
+ private LinksetManager linkSetManager = null;
private Logger logger = Logger.getLogger(SS7Service.class);
@@ -65,7 +67,9 @@
logger.info("Starting SS7 management shell environment");
shell = new ShellExecutor(InetAddress.getByName(this.shellAddress),
this.shellPort);
+ shell.setLinksetManager(this.linkSetManager);
shell.start();
+
logger.info("Started SS7 service");
}
@@ -97,6 +101,14 @@
public void setConfigPath(String path) {
this.path = path;
}
+
+ public LinksetManager getLinkSetManager() {
+ return linkSetManager;
+ }
+
+ public void setLinkSetManager(LinksetManager linkSetManager) {
+ this.linkSetManager = linkSetManager;
+ }
@Override
public void stopService() {
=======================================
---
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
Sat Dec 25 00:31:03 2010
+++
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java
Mon Dec 27 00:10:16 2010
@@ -26,6 +26,8 @@
import javolution.util.FastList;
import org.apache.log4j.Logger;
+import org.mobicents.protocols.ss7.management.console.Subject;
+import org.mobicents.protocols.ss7.mtp.oam.LinksetManager;
import org.mobicents.ss7.management.transceiver.ChannelProvider;
import org.mobicents.ss7.management.transceiver.ChannelSelectionKey;
import org.mobicents.ss7.management.transceiver.ChannelSelector;
@@ -53,6 +55,10 @@
private String rxMessage = "";
private String txMessage = "";
+ private LinksetManager linksetManager = null;
+
+ private LinksetListenerImpl linksetListenerImpl = null;
+
private volatile boolean started = false;
public ShellExecutor(InetAddress address, int port) throws IOException
{
@@ -72,6 +78,8 @@
}
public void start() {
+ linksetListenerImpl = new LinksetListenerImpl(this.linksetManager);
+
this.started = true;
new Thread(this).start();
}
@@ -79,6 +87,14 @@
public void stop() {
this.started = false;
}
+
+ protected LinksetManager getLinksetManager() {
+ return linksetManager;
+ }
+
+ protected void setLinksetManager(LinksetManager linksetManager) {
+ this.linksetManager = linksetManager;
+ }
public String getReceivedMessage() {
return rxMessage;
@@ -100,17 +116,38 @@
} else if (key.isReadable()) {
ShellChannel chan = (ShellChannel) key.channel();
Message msg = (Message) chan.receive();
- System.out.println("Receive " + msg);
- rxMessage = msg.toString();
-
- if (rxMessage.compareTo("disconnect") == 0) {
- this.txMessage = "Bye";
-
chan.send(messageFactory.createMessage(txMessage));
-
- } else {
- //TODO : Clean this. Reflecting message now
- chan.send(messageFactory.createMessage("From
server : "+rxMessage));
- }
+
+ if (msg != null) {
+ System.out.println("Receive " + msg);
+ rxMessage = msg.toString();
+
+ 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
Command"));
+ } else {
+ // Nullify examined options
+ options[0] = null;
+
+ switch (subject) {
+ case LINKSET:
+ this.txMessage =
this.linksetListenerImpl
+ .execute(options);
+ chan.send(messageFactory
+
.createMessage(this.txMessage));
+ break;
+ }
+ }
+ } // if (rxMessage.compareTo("disconnect")
+ } // if (msg != null)
// TODO Handle message
@@ -120,12 +157,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 = "";
}