Revision: 15841
Author: [email protected]
Date: Fri Dec 17 02:47:03 2010
Log: Fix for http://code.google.com/p/mobicents/issues/detail?id=2217
http://code.google.com/p/mobicents/source/detail?r=15841

Deleted:
 /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/gct
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp1.java
Modified:
 /trunk/protocols/ss7/mtp/.classpath
 /trunk/protocols/ss7/mtp/mtp-impl/pom.xml
/trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java
 /trunk/protocols/ss7/mtp/pom.xml

=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp1.java Fri Dec 10 01:06:13 2010
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Mobicents, Communications Middleware
- *
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party
- * contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
- *
- * 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
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program 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 distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- *
- * Boston, MA  02110-1301  USA
- */
-package org.mobicents.protocols.ss7.mtp;
-
-import java.io.IOException;
-import org.mobicents.protocols.stream.api.Stream;
-
-/**
- * @author baranowb
- * @author kulikov
- */
-public interface Mtp1 extends Stream {
-       // FIXME: Oleg what's that?
-       /**
-        * Gets the code of this channel.
-        *
-        * @return the code of this channel.
-        */
-       public int getCode();
-
-       /**
-        * Set MTP2 layer serving this MTP1
-        *
-        * @param link
-        */
-       public void setLink(Mtp2 link);
-
-       /**
-        * Get MTP2 layer serving this MTP1
-        *
-        * @return
-        */
-       public Mtp2 getLink();
-       /**
-        * Fetches implementation dependent IO Buffer size which should be used
- * @return integer number, Mtp2 implementation should assign buffers of this size to interact with Mtp1
-        */
-       public int getIOBufferSize();
-
-       /**
-        * Reads up to buffer.length bytes from layer 1.
-        *
-        * @param buffer
-        *            reader buffer
-        * @return the number of actually read bytes.
-        */
-       public int read(byte[] buffer) throws IOException;
-
-       /**
-        * Writes data to layer 1.
-        *
-        * @param buffer
-        *            the buffer containing data to write.
-        * @param bytesToWrite
-        */
-       public void write(byte[] buffer, int bytesToWrite) throws IOException;
-
-       /**
-        * Open message transfer part layer 1.
-        */
-       public void open() throws IOException;
-
-       /**
-        * Close message transfer part layer 1.
-        */
-       public void close();
-
-}
=======================================
--- /trunk/protocols/ss7/mtp/.classpath Sun Dec 12 21:45:17 2010
+++ /trunk/protocols/ss7/mtp/.classpath Fri Dec 17 02:47:03 2010
@@ -4,14 +4,13 @@
<classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/> <classpathentry kind="src" path="docs/sources-mobicents/src/main/resources"/>
   <classpathentry kind="src" path="docs/sources/src/main/resources"/>
-  <classpathentry kind="src" path="management/cli/src/main/java"/>
-  <classpathentry kind="src" path="management/cli/src/test/java"/>
-  <classpathentry kind="src" path="management/cli/src/main/resources"/>
   <classpathentry kind="src" path="mtp-impl/src/main/java"/>
   <classpathentry kind="src" path="mtp-impl/src/test/java"/>
<classpathentry kind="var" path="M2_REPO/javolution/javolution/5.5.1/javolution-5.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.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/stream/stream/1.0.0.BETA2/stream-1.0.0.BETA2.jar"/>
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/pom.xml   Sun Dec 12 02:54:27 2010
+++ /trunk/protocols/ss7/mtp/mtp-impl/pom.xml   Fri Dec 17 02:47:03 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>
@@ -9,7 +11,7 @@

        <artifactId>mtp</artifactId>
        <name>Mobicents SS7 :: MTP :: Impl :: ${pom.artifactId}</name>
-
+
        <developers>
                <developer>
                        <id>oleg.kulikoff</id>
@@ -56,6 +58,14 @@

        <dependencies>
                <dependency>
+                       <artifactId>mobicents-dahdi</artifactId>
+                       <groupId>org.mobicents.protocols.ss7.hardware</groupId>
+               </dependency>
+                       <dependency>
+                               <artifactId>mobicents-dialogic</artifactId>
+                               
<groupId>org.mobicents.protocols.ss7.hardware</groupId>
+                       </dependency>
+               <dependency>
                        <groupId>org.mobicents.protocols.ss7.m3ua</groupId>
                        <artifactId>m3ua-api</artifactId>
                </dependency>
@@ -78,6 +88,10 @@
                        <artifactId>junit</artifactId>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>javolution</groupId>
+                       <artifactId>javolution</artifactId>
+               </dependency>
        </dependencies>
-
+
 </project>
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java Mon Dec 13 01:56:35 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp2.java Fri Dec 17 02:47:03 2010
@@ -27,10 +27,10 @@
 package org.mobicents.protocols.ss7.mtp;

 import java.io.IOException;
-import java.util.Arrays;

 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.mobicents.protocols.ss7.hardware.Mtp1;
 import org.mobicents.protocols.ss7.mtp.Mtp3.SLTMTest;

 /**
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java Mon Dec 13 01:56:35 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/Mtp3.java Fri Dec 17 02:47:03 2010
@@ -27,12 +27,14 @@
 package org.mobicents.protocols.ss7.mtp;

 import java.io.IOException;
-import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
+
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.mobicents.protocols.ss7.hardware.Mtp1;
 import org.mobicents.protocols.stream.api.SelectorKey;
 import org.mobicents.protocols.stream.api.SelectorProvider;
 import org.mobicents.protocols.stream.api.StreamSelector;
@@ -186,6 +188,15 @@
         }

     }
+
+    public void addLink(Mtp2 mtp2){
+       mtp2.mtp3 = this;
+       this.links.add(mtp2);
+    }
+
+    public void clearLinks(){
+       this.links.clear();
+    }

     /**
      * Starts linkset.
@@ -211,12 +222,12 @@
         try {
Collection<SelectorKey> selected = selector.selectNow(StreamSelector.OP_READ, 20);
             for (SelectorKey key : selected) {
-                ((Mtp1) key.getStream()).getLink().doRead();
+                ((Mtp2)((Mtp1) key.getStream()).getLink()).doRead();
             }

             selected = selector.selectNow(StreamSelector.OP_WRITE, 20);
             for (SelectorKey key : selected) {
-                ((Mtp1) key.getStream()).getLink().doWrite();
+                ((Mtp2)((Mtp1) key.getStream()).getLink()).doWrite();
             }

             this.executor.tick();
=======================================
--- /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java Sun Dec 12 02:54:27 2010 +++ /trunk/protocols/ss7/mtp/mtp-impl/src/main/java/org/mobicents/protocols/ss7/mtp/dialogic/MtpImpl.java Fri Dec 17 02:47:03 2010
@@ -17,12 +17,13 @@
  */
 package org.mobicents.protocols.ss7.mtp.dialogic;

-import org.mobicents.gct.InterProcessCommunicator;
 import java.io.IOException;
 import java.util.Properties;
+
 import org.apache.log4j.Logger;
 import org.mobicents.protocols.ConfigurationException;
 import org.mobicents.protocols.StartFailedException;
+import org.mobicents.protocols.ss7.hardware.dialogic.InterProcessCommunicator;
 import org.mobicents.protocols.ss7.mtp.Utils;
 import org.mobicents.protocols.ss7.mtp.provider.MtpListener;
 import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
=======================================
--- /trunk/protocols/ss7/mtp/pom.xml    Sun Dec 12 21:46:19 2010
+++ /trunk/protocols/ss7/mtp/pom.xml    Fri Dec 17 02:47:03 2010
@@ -25,7 +25,6 @@
                <module>docs</module>
        </modules>

-
        <scm>
                <connection>
                        
scm:svn:https://mobicents.googlecode.com/svn/trunk/protocols/ss7/mtp

Reply via email to