Revision: 15843
Author: [email protected]
Date: Fri Dec 17 03:20:02 2010
Log: Changes for http://code.google.com/p/mobicents/issues/detail?id=2217
http://code.google.com/p/mobicents/source/detail?r=15843
Added:
/trunk/servers/media/core/server-standalone/src/main/config/ss7
/trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml
Deleted:
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Channel.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Schannel.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Selector.java
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/SelectorKeyImpl.java
/trunk/servers/media/core/server-standalone/src/main/config/ss7-beans.xml
/trunk/servers/media/core/zap
Modified:
/trunk/servers/media/core/.classpath
/trunk/servers/media/core/pom.xml
/trunk/servers/media/core/server-impl/pom.xml
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
/trunk/servers/media/core/server-standalone/pom.xml
/trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
/trunk/servers/media/core/server-standalone/src/main/config/run.sh
=======================================
--- /dev/null
+++
/trunk/servers/media/core/server-standalone/src/main/config/ss7/ss7-beans.xml
Fri Dec 17 03:20:02 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="SChannel1"
+ class="org.mobicents.protocols.ss7.hardware.dahdi.Channel">
+ <property name="span">1</property>
+ <property name="channelID">16</property>
+ <property name="code">0</property>
+ <property name="IOBufferSize">32</property>
+ </bean>
+ <bean name="SChannel2"
+ class="org.mobicents.protocols.ss7.hardware.dahdi.Channel">
+ <property name="span">1</property>
+ <property name="channelID">17</property>
+ <property name="code">1</property>
+ <property name="IOBufferSize">32</property>
+ </bean>
+
+ <!-- bean name="M3UserAgent"
class="org.mobicents.protocols.ss7.stream.tcp.M3UserAgent">
+ <property name="port">1345</property>
+ <property name="address">127.0.0.1</property>
+ </bean -->
+
+
+ <bean name="MTP"
+ class="org.mobicents.media.server.impl.resource.zap.MTPUser">
+ <property name="name">TEST_1</property>
+ <property name="opc">14133</property>
+ <property name="dpc">14150</property>
+ <!--
+ (0000) 0 International network
+ (0001) 1 Spare (for international use only)
+ (0010) 2 National network
+ (0011) 3 Reserved for national use
+ -->
+ <property name="networkIndicator">2</property>
+ <property name="localAddress">127.0.0.1</property>
+ <property name="localPort">3434</property>
+ <property name="channels">
+ <list>
+ <inject bean="SChannel1" />
+ <!-- inject bean="SChannel2"/ -->
+ </list>
+ </property>
+ </bean>
+</deployment>
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Channel.java
Fri Dec 10 01:07:45 2010
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.media.server.impl.resource.zap;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import org.mobicents.protocols.ss7.mtp.Mtp1;
-import org.mobicents.protocols.ss7.mtp.Mtp2;
-import org.mobicents.protocols.stream.api.SelectorKey;
-import org.mobicents.protocols.stream.api.SelectorProvider;
-import org.mobicents.protocols.stream.api.StreamSelector;
-
-public class Channel implements Mtp1 {
-
- private final static String MMS_HOME = "MMS_HOME";
- private final static String LIB_NAME = "zap-native-linux.so";
-
- static {
- try {
- Map<String, String> env = System.getenv();
- if (env.get(MMS_HOME) != null) {
- String path = env.get(MMS_HOME) + File.separator + "native" +
File.separator + LIB_NAME;
- System.load(path);
- System.out.println("Loaded library " + path);
- } else {
- System.out.println("Can not load library");
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private int span;
- private int channelID;
- private int code;
- private String linkName;
- private int ioBufferSize = 32; // lets default to 32, it seems optimal.
- protected int fd;
-
- private Mtp2 link;
-
- protected SelectorKey selectorKey;
-
- public Channel() {
- }
-
- public int getSpan() {
- return span;
- }
-
- public void setSpan(int span) {
- this.span = span;
- }
-
- public int getChannelID() {
- return channelID;
- }
-
- public void setChannelID(int channelID) {
- this.channelID = channelID;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-
- public void setLinkName(String linkName) {
- this.linkName = linkName;
- }
-
- public String getLinkName() {
- return linkName;
- }
-
- public int getIOBufferSize() {
- return ioBufferSize;
- }
-
- public void setIOBufferSize(int bufferSize) {
- this.ioBufferSize = bufferSize;
- }
-
- public void open() {
- int zapid = 31 * (span - 1) + channelID;
- fd = openChannel(zapid, ioBufferSize);
- }
-
- /**
- * Opens this channel and prepares it for reading.
- *
- * @param id
- * - id of zap device, its appended at the end of path, for
- * instance: /dev/dahdi/${id}
- * @param bufferSize
- * - size of buffer to be used for I/O ops.
- */
- public native int openChannel(int id, int bufferSize);
-
- /**
- * Reads data from this pipe.
- *
- * @param buffer
- * the byte buffer to read data.
- * @return the number of bytes actualy read.
- */
- public int read(byte[] buffer) throws IOException {
- return readData(fd, buffer);
- }
-
- public native int readData(int fd, byte[] buffer);
-
- /**
- * Writes specified data to the pipe.
- *
- * @param buffer
- * the buffer with data to write
- * @param len
- * the length of the buffer.
- */
- public int write(byte[] buffer) throws IOException {
- writeData(fd, buffer, buffer.length);
- return buffer.length; //?
- }
-
- public native void writeData(int fd, byte[] buffer, int len);
-
- /**
- * Registers pipe for polling.
- *
- * @param fd
- * the file descriptor.
- */
- public native void doRegister(int fd);
-
- /**
- * Unregisters pipe from polling.
- *
- * @param fd
- * the file descriptor.
- */
- public native void doUnregister(int fd);
-
- public void close() {
- closeChannel(fd);
- }
-
- /**
- * Closes this pipe.
- */
- public native void closeChannel(int fd);
-
- @Override
- public String toString() {
- return Integer.toString(channelID);
- }
-
- public void setLink(Mtp2 link) {
- this.link = link;
- }
-
- public Mtp2 getLink() {
- return this.link;
- }
-
- protected void doRegister(StreamSelector selector) {
- doRegister(fd);
- }
-
- protected void doUnregister(StreamSelector selector) {
- doUnregister(fd);
- }
-
- public boolean isReadable() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public boolean isWriteable() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public SelectorProvider provider() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public SelectorKey register(StreamSelector selector) throws IOException
{
- return ((Selector) selector).register(this);
- }
-
- public void write(byte[] data, int len) throws IOException {
- this.writeData(fd, data, len);
- }
-
-}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Schannel.java
Tue May 4 23:31:18 2010
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.media.server.impl.resource.zap;
-
-import java.io.File;
-import java.util.Map;
-
-/**
- *
- * @author kulikov
- * @author baranowb
- */
-public class Schannel {
- private static final String _LIB_NAME_ = "zap-native-linux.so";
- private static final String _MMS_HOME_ = "MMS_HOME";
- private static final String _SCHANNEL_HOME_ = "lib_schannel";
-
- public native int open(int[] zapId);
-
- public native int read(byte[] buffer);
-
- public native void write(byte[] buffer, int len);
-
- public native void close();
-
- public native String sayHello();
-
- static {
- try {
- Map<String, String> env = System.getenv();
- String path = null;
- if (env.get(_MMS_HOME_) == null) {
- // this mean we are runnign in different env?
like jslee
- path = env.get(_SCHANNEL_HOME_) +
File.separator + _LIB_NAME_;
- //System.loadLibrary("zap-native-linux");
- } else {
- path = env.get(_MMS_HOME_) + File.separator +
"native"
- + File.separator + _LIB_NAME_;
- System.load(path);
- }
- System.out.println("Loaded "+_LIB_NAME_);
- } catch (UnsatisfiedLinkError x) {
- x.printStackTrace();
- }
-
- }
-}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/Selector.java
Wed Jul 14 04:05:39 2010
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and individual contributors as
indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but
WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.mobicents.media.server.impl.resource.zap;
-
-import java.io.File;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.mobicents.protocols.ss7.mtp.Mtp1;
-
-import org.apache.log4j.Logger;
-import org.mobicents.protocols.stream.api.SelectorKey;
-import org.mobicents.protocols.stream.api.Stream;
-import org.mobicents.protocols.stream.api.StreamSelector;
-
-public class Selector implements StreamSelector {
-
- private final static String MMS_HOME = "MMS_HOME";
- private final static String LIB_NAME = "zap-native-linux.so";
-
- public final static int READ = 0x01;
- public final static int WRITE = 0x02;
-
- /** array of selected file descriptors */
- private int fds[] = new int[16];
-
- /** array of registered channels */
- private ArrayList<Mtp1> registered = new ArrayList();
-
- private int ops;
-
- /** array of selected channels */
- private ArrayList<SelectorKey> selected = new ArrayList();
- private static Logger logger = Logger.getLogger(Selector.class);
-
- static {
- try {
- Map<String, String> env = System.getenv();
- if (env.get(MMS_HOME) != null) {
- String path = env.get(MMS_HOME) + File.separator + "native" +
File.separator + LIB_NAME;
- System.load(path);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public Selector() {
-
- }
-
- /**
- * Register channel with this selector.
- *
- * @param channel the channel to register.
- */
- public SelectorKey register(Channel channel) {
- //add channel instance to the collection
- registered.add(channel);
- //perform actual registration
- logger.info("Registering file descriptor:" + ((Channel) channel).fd);
- doRegister(((Channel)channel).fd);
-
- SelectorKeyImpl key = new SelectorKeyImpl(channel, this);
- channel.selectorKey = key;
- return key;
- }
-
- /**
- * Unregister channel.
- *
- * @param channel the channel to unregister.
- */
- public void unregister(Channel channel) {
- registered.remove(channel);
- channel.selectorKey = null;
- doUnregister(((Channel)channel).fd);
- }
-
- /**
- * Registers pipe for polling.
- *
- *...@param fd the file descriptor.
- */
- public native void doRegister(int fd);
-
- /**
- * Unregisters pipe from polling.
- *
- * @param fd the file descriptor.
- */
- public native void doUnregister(int fd);
-
- /**
- * Delegates select call to unix poll function.
- *
- * @param fds the list of file descriptors.
- * @param key selection key.
- * @return the number of selected channels.
- */
- public native int doPoll(int[] fds, int key, int timeout);
-
- public Collection<SelectorKey> selectNow(int ops, int timeout) throws
IOException {
- int count = doPoll(fds, ops, 20);
- selected.clear();
- for (int i = 0; i < count; i++) {
- for (Mtp1 chan : registered) {
- Channel channel = (Channel) chan;
- if (channel.fd == fds[i]) {
- selected.add(channel.selectorKey);
- }
- }
- }
- return selected;
- }
-
- public void setOperation(int v) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public int getOperations() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public boolean isReadOperation() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public boolean isWriteOperation() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public boolean isClosed() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public void close() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public Collection<Stream> getRegisteredStreams() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-}
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/SelectorKeyImpl.java
Wed Jul 14 04:05:39 2010
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.mobicents.media.server.impl.resource.zap;
-
-import org.mobicents.protocols.stream.api.SelectorKey;
-import org.mobicents.protocols.stream.api.Stream;
-import org.mobicents.protocols.stream.api.StreamSelector;
-
-/**
- *
- * @author kulikov
- */
-public class SelectorKeyImpl implements SelectorKey {
-
- private boolean isValid;
- private boolean isReadable;
- private boolean isWritable;
-
- private Channel channel;
- private Selector selector;
-
- private Object attachment;
-
- protected SelectorKeyImpl(Channel channel, Selector selector) {
- this.channel = channel;
- this.selector = selector;
- }
-
- public boolean isValid() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public boolean isReadable() {
- return isReadable;
- }
-
- public boolean isWriteable() {
- return isWritable;
- }
-
- public Stream getStream() {
- return channel;
- }
-
- public StreamSelector getStreamSelector() {
- return selector;
- }
-
- public void cancel() {
- selector.unregister(channel);
- }
-
- public void attach(Object obj) {
- this.attachment = obj;
- }
-
- public Object attachment() {
- return this.attachment;
- }
-
-}
=======================================
---
/trunk/servers/media/core/server-standalone/src/main/config/ss7-beans.xml
Fri Dec 10 01:07:45 2010
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="SChannel1"
- class="org.mobicents.media.server.impl.resource.zap.Channel">
- <property name="span">1</property>
- <property name="channelID">16</property>
- <property name="code">0</property>
- <property name="IOBufferSize">32</property>
- </bean>
- <bean name="SChannel2"
- class="org.mobicents.media.server.impl.resource.zap.Channel">
- <property name="span">1</property>
- <property name="channelID">17</property>
- <property name="code">1</property>
- <property name="IOBufferSize">32</property>
- </bean>
-
- <!-- bean name="M3UserAgent"
class="org.mobicents.protocols.ss7.stream.tcp.M3UserAgent">
- <property name="port">1345</property>
- <property name="address">127.0.0.1</property>
- </bean -->
-
-
- <bean name="MTP"
- class="org.mobicents.media.server.impl.resource.zap.MTPUser">
- <property name="name">TEST_1</property>
- <property name="opc">14133</property>
- <property name="dpc">14150</property>
- <!--
- (0000) 0 International network
- (0001) 1 Spare (for international use only)
- (0010) 2 National network
- (0011) 3 Reserved for national use
- -->
- <property name="networkIndicator">2</property>
- <property name="localAddress">127.0.0.1</property>
- <property name="localPort">3434</property>
- <property name="channels">
- <list>
- <inject bean="SChannel1" />
- <!-- inject bean="SChannel2"/ -->
- </list>
- </property>
- </bean>
-</deployment>
=======================================
--- /trunk/servers/media/core/.classpath Fri Nov 19 01:13:39 2010
+++ /trunk/servers/media/core/.classpath Fri Dec 17 03:20:02 2010
@@ -7,7 +7,6 @@
<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="zap/native/src/test/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"/>
@@ -19,6 +18,7 @@
<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"/>
@@ -52,10 +52,12 @@
<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/m3ua/m3ua-api/1.0.0.BETA3-SNAPSHOT/m3ua-api-1.0.0.BETA3-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/protocols/ss7/m3ua/m3ua-impl/1.0.0.BETA3-SNAPSHOT/m3ua-impl-1.0.0.BETA3-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/protocols/ss7/mtp/mtp/1.0.0.BETA4-SNAPSHOT/mtp-1.0.0.BETA4-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/mobicents/protocols/stream/stream/1.0.0.BETA1/stream-1.0.0.BETA1.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/hardware/mobicents-dialogic/1.0.0-SNAPSHOT/mobicents-dialogic-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/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"/>
=======================================
--- /trunk/servers/media/core/pom.xml Fri Nov 26 04:28:41 2010
+++ /trunk/servers/media/core/pom.xml Fri Dec 17 03:20:02 2010
@@ -5,7 +5,7 @@
<parent>
<groupId>org.mobicents</groupId>
<artifactId>mobicents-parent</artifactId>
- <version>2.5</version>
+ <version>2.15</version>
</parent>
<groupId>org.mobicents.servers.media</groupId>
@@ -39,6 +39,7 @@
<version.mtp>1.0.0-SNAPSHOT</version.mtp>
<version.stream>1.0.0-SNAPSHOT</version.stream>
<version.m3ua>1.0.0-SNAPSHOT</version.m3ua>
+ <version.hardware>1.0.0-SNAPSHOT</version.hardware>
</properties>
<modules>
@@ -46,7 +47,6 @@
<module>server-impl</module>
<module>controllers</module>
<module>server-standalone</module>
- <module>zap</module>
<!-- module>docs</module -->
</modules>
<dependencies>
@@ -105,16 +105,6 @@
<!-- RELEASE STUFF -->
<profiles>
- <profile>
- <id>ss7</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <modules>
- <module>zap</module>
- </modules>
- </profile>
-
<profile>
<id>maven-release</id>
<modules>
@@ -123,7 +113,6 @@
<module>server-impl</module>
<module>server-standalone</module>
<module>controllers</module>
- <module>zap</module>
</modules>
<build>
<plugins>
=======================================
--- /trunk/servers/media/core/server-impl/pom.xml Fri Nov 19 01:17:54 2010
+++ /trunk/servers/media/core/server-impl/pom.xml Fri Dec 17 03:20:02 2010
@@ -1,5 +1,7 @@
<?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">
+<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>
@@ -112,16 +114,21 @@
<artifactId>stream</artifactId>
<version>${version.stream}</version>
</dependency>
- <dependency>
- <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
- <artifactId>m3ua-api</artifactId>
- <version>${version.m3ua}</version>
- </dependency>
- <dependency>
- <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
- <artifactId>m3ua-impl</artifactId>
- <version>${version.m3ua}</version>
- </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
+ <artifactId>m3ua-api</artifactId>
+ <version>${version.m3ua}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
+ <artifactId>m3ua-impl</artifactId>
+ <version>${version.m3ua}</version>
+ </dependency>
+ <dependency>
+ <artifactId>mobicents-dahdi</artifactId>
+ <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+ <version>${version.hardware}</version>
+ </dependency>
</dependencies>
<build>
<finalName>${pom.artifactId}-${pom.version}</finalName>
=======================================
---
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
Tue Nov 30 01:06:30 2010
+++
/trunk/servers/media/core/server-impl/src/main/java/org/mobicents/media/server/impl/resource/zap/MTPUser.java
Fri Dec 17 03:20:02 2010
@@ -33,12 +33,14 @@
import java.util.Collection;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
+
import org.apache.log4j.Logger;
import org.mobicents.media.Server;
import org.mobicents.media.server.impl.clock.LocalTask;
import org.mobicents.media.server.spi.clock.Task;
-import org.mobicents.protocols.link.LinkState;
+import org.mobicents.protocols.link.LinkState;
import org.mobicents.protocols.link.LinkStateListener;
+import org.mobicents.protocols.ss7.hardware.Mtp1;
import org.mobicents.protocols.ss7.m3ua.M3UAChannel;
import org.mobicents.protocols.ss7.m3ua.M3UAProvider;
import org.mobicents.protocols.ss7.m3ua.M3UASelectionKey;
@@ -50,7 +52,6 @@
import org.mobicents.protocols.ss7.m3ua.message.MessageType;
import org.mobicents.protocols.ss7.m3ua.message.TransferMessage;
import org.mobicents.protocols.ss7.m3ua.message.parm.ProtocolData;
-import org.mobicents.protocols.ss7.mtp.Mtp1;
import org.mobicents.protocols.ss7.mtp.Mtp2;
import org.mobicents.protocols.ss7.mtp.Mtp3;
import org.mobicents.protocols.ss7.mtp.Mtp3Listener;
=======================================
--- /trunk/servers/media/core/server-standalone/pom.xml Fri Nov 19 01:17:54
2010
+++ /trunk/servers/media/core/server-standalone/pom.xml Fri Dec 17 03:20:02
2010
@@ -1,4 +1,6 @@
-<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">
+<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.servers.media</groupId>
@@ -58,7 +60,7 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
<version>1.2.139</version>
@@ -79,7 +81,7 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>2.0.6.GA</version>
+ <version>2.0.6.GA</version>
</dependency>
<!-- Comment this if you want plain POJO bootstrap -->
<!--
@@ -127,4 +129,79 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>ss7linux</id>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+
<phase>package</phase>
+ <goals>
+
<goal>copy</goal>
+ </goals>
+ <configuration>
+
<artifactItems>
+
<artifactItem>
+
<groupId>
+
org.mobicents.protocols.ss7.hardware
+
</groupId>
+
<artifactId>
+
libmobicents-dahdi-linux
+
</artifactId>
+
<version>
+
${version.hardware}
+
</version>
+
<type>so</type>
+
<overWrite>true</overWrite>
+
<outputDirectory>
+
${project.build.directory}/mms-standalone-server/native
+
</outputDirectory>
+
<destFileName>
+
libmobicents-dahdi-linux.so
+
</destFileName>
+
</artifactItem>
+
</artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+
<artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ <executions>
+ <execution>
+
<id>copy-resources</id>
+ <!-- here the
phase you need -->
+
<phase>validate</phase>
+ <goals>
+
<goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>
+
${project.build.directory}/mms-standalone-server/ss7
+
</outputDirectory>
+
<resources>
+
<resource>
+
<directory>
+
src/main/config/ss7
+
</directory>
+
<filtering>false</filtering>
+
</resource>
+
</resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
=======================================
--- /trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
Fri Jun 25 05:29:35 2010
+++ /trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
Fri Dec 17 03:20:02 2010
@@ -1,5 +1,5 @@
<assembly>
- <id>pojo</id>
+ <id>server</id>
<formats>
<format>zip</format>
</formats>
@@ -57,6 +57,7 @@
<source>src/main/config/rtsp-beans.xml</source>
<destName>deploy/endpoint/rtsp-beans.xml</destName>
</file -->
+<!-- Legacy Telco -->
<file>
<source>src/main/config/mgw-beans.xml</source>
<destName>deploy/endpoint/mgw-beans.xml</destName>
=======================================
--- /trunk/servers/media/core/server-standalone/src/main/config/run.sh Fri
Mar 19 05:23:38 2010
+++ /trunk/servers/media/core/server-standalone/src/main/config/run.sh Fri
Dec 17 03:20:02 2010
@@ -137,6 +137,10 @@
# Setup the java endorsed dirs
MMS_ENDORSED_DIRS="$MMS_HOME/lib"
+# Setup path for native libs
+LD_LIBRARY_PATH="$MMS_HOME/native"
+export LD_LIBRARY_PATH
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
MMS_HOME=`cygpath --path --windows "$MMS_HOME"`