Revision: 16401
Author: [email protected]
Date: Thu Jan 13 02:32:23 2011
Log: sccp shouldn't depend on mtp directly
http://code.google.com/p/mobicents/source/detail?r=16401
Modified:
/trunk/protocols/ss7/sccp/.classpath
/trunk/protocols/ss7/sccp/sccp-api/pom.xml
/trunk/protocols/ss7/sccp/sccp-api/src/main/java/org/mobicents/protocols/ss7/sccp/SccpStack.java
/trunk/protocols/ss7/sccp/sccp-impl/pom.xml
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpService.java
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpServiceMBean.java
/trunk/protocols/ss7/sccp/sccp-impl/src/test/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImplTest.java
=======================================
--- /trunk/protocols/ss7/sccp/.classpath Tue Dec 28 22:59:55 2010
+++ /trunk/protocols/ss7/sccp/.classpath Thu Jan 13 02:32:23 2011
@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src"
path="docs/sources-mobicents/src/main/resources"/>
- <classpathentry kind="src"
path="docs/sources-mobicents/src/main/resources"/>
<classpathentry kind="src" path="sccp-api/src/main/java"/>
<classpathentry kind="src" path="sccp-api/src/test/java"/>
<classpathentry kind="src" path="twiddle/cli/src/main/java"/>
- <classpathentry kind="src"
path="twiddle/docs/sources-mobicents/src/main/resources"/>
- <classpathentry kind="src"
path="twiddle/docs/sources-mobicents/src/main/resources"/>
<classpathentry kind="src" path="sccp-impl/src/test/java"/>
<classpathentry kind="src" path="sccp-impl/src/main/java"/>
<classpathentry kind="src" path="sccp-impl/src/main/resources"/>
@@ -160,11 +156,8 @@
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.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/management/linkset/1.0.0-SNAPSHOT/linkset-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.BETA2/stream-1.0.0.BETA2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/protocols/ss7/management/linkset/1.0.0.BETA7-SNAPSHOT/linkset-1.0.0.BETA7-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/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.jar"/>
<classpathentry kind="var"
path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar"/>
<classpathentry kind="var"
path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
=======================================
--- /trunk/protocols/ss7/sccp/sccp-api/pom.xml Sun Jan 9 04:39:47 2011
+++ /trunk/protocols/ss7/sccp/sccp-api/pom.xml Thu Jan 13 02:32:23 2011
@@ -20,11 +20,12 @@
<!--
<dependency> <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version> </dependency>
- -->
+
<dependency>
<artifactId>mtp</artifactId>
<groupId>org.mobicents.protocols.ss7.mtp</groupId>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
=======================================
---
/trunk/protocols/ss7/sccp/sccp-api/src/main/java/org/mobicents/protocols/ss7/sccp/SccpStack.java
Tue Dec 28 22:59:55 2010
+++
/trunk/protocols/ss7/sccp/sccp-api/src/main/java/org/mobicents/protocols/ss7/sccp/SccpStack.java
Thu Jan 13 02:32:23 2011
@@ -17,7 +17,6 @@
*/
package org.mobicents.protocols.ss7.sccp;
-import org.mobicents.protocols.StartFailedException;
/**
* @author amit bhayani
@@ -32,9 +31,8 @@
* Starts SCCP stack.
*
* @throws java.lang.IllegalStateException
- * @throws org.mobicents.protocols.StartFailedException
*/
- public void start() throws IllegalStateException, StartFailedException;
+ public void start() throws IllegalStateException;
/**
* Terminates SCCP stack.
=======================================
--- /trunk/protocols/ss7/sccp/sccp-impl/pom.xml Sun Jan 9 04:39:47 2011
+++ /trunk/protocols/ss7/sccp/sccp-impl/pom.xml Thu Jan 13 02:32:23 2011
@@ -27,10 +27,13 @@
<artifactId>sccp-api</artifactId>
<version>${pom.version}</version>
</dependency>
+ <!--
<dependency>
<artifactId>mtp</artifactId>
<groupId>org.mobicents.protocols.ss7.mtp</groupId>
</dependency>
+ -->
+
<dependency>
<artifactId>linkset</artifactId>
<groupId>org.mobicents.protocols.ss7.management</groupId>
=======================================
---
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpService.java
Tue Dec 28 22:59:55 2010
+++
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpService.java
Thu Jan 13 02:32:23 2011
@@ -17,22 +17,19 @@
*/
package org.mobicents.protocols.ss7.sccp.impl;
-import java.util.List;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.log4j.Logger;
import org.jboss.system.ServiceMBeanSupport;
-import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
import org.mobicents.protocols.ss7.sccp.Router;
import org.mobicents.protocols.ss7.sccp.impl.router.RouterImpl;
import org.mobicents.protocols.ss7.sccp.impl.router.Rule;
import org.mobicents.protocols.ss7.sccp.impl.router.RuleException;
/**
- *
+ * TODO This MBean is not needed now. Delete?
* @author kulikov
*/
public class SccpService extends ServiceMBeanSupport implements
SccpServiceMBean {
@@ -41,7 +38,7 @@
private SccpStackImpl stack;
private String jndiName;
private String path;
- private List<MtpProvider> linksets;
+ //private List<MtpProvider> linksets;
public void setJndiName(String jndiName) {
this.jndiName = jndiName;
@@ -51,9 +48,9 @@
return jndiName;
}
- public void setLinksets(List<MtpProvider> linksets) {
- this.linksets = linksets;
- }
+// public void setLinksets(List<MtpProvider> linksets) {
+// this.linksets = linksets;
+// }
public void setConfigPath(String path) {
this.path = path;
=======================================
---
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpServiceMBean.java
Mon Nov 8 23:56:46 2010
+++
/trunk/protocols/ss7/sccp/sccp-impl/src/main/java/org/mobicents/protocols/ss7/sccp/impl/SccpServiceMBean.java
Thu Jan 13 02:32:23 2011
@@ -17,9 +17,6 @@
*/
package org.mobicents.protocols.ss7.sccp.impl;
-import java.util.List;
-
-import org.mobicents.protocols.ss7.mtp.provider.MtpProvider;
import org.mobicents.protocols.ss7.sccp.impl.router.Rule;
import org.mobicents.protocols.ss7.sccp.impl.router.RuleException;
@@ -35,7 +32,7 @@
public String getJndiName();
- public void setLinksets(List<MtpProvider> linksets);
+ //public void setLinksets(List<MtpProvider> linksets);
public void start() throws Exception;
=======================================
---
/trunk/protocols/ss7/sccp/sccp-impl/src/test/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImplTest.java
Thu Oct 7 03:43:09 2010
+++
/trunk/protocols/ss7/sccp/sccp-impl/src/test/java/org/mobicents/protocols/ss7/sccp/impl/SccpStackImplTest.java
Thu Jan 13 02:32:23 2011
@@ -18,14 +18,15 @@
package org.mobicents.protocols.ss7.sccp.impl;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.mobicents.protocols.StartFailedException;
import org.mobicents.protocols.ss7.indicator.NatureOfAddress;
import org.mobicents.protocols.ss7.sccp.SccpListener;
import org.mobicents.protocols.ss7.sccp.SccpProvider;
@@ -59,7 +60,7 @@
}
@Before
- public void setUp() throws IllegalStateException, StartFailedException
{
+ public void setUp() throws IllegalStateException {
stack.start();
GlobalTitle gt1 =
GlobalTitle.getInstance(NatureOfAddress.NATIONAL, "1234");