Now depending on SS7 2.0.0-SNAPSHOT

README.txt

@@ -8,28 +8,28 @@ To test USSD Gateway with mobicents ss7-simulator make sure you follow the below
 	b) http-client/http-client-ra-DU-2.5.0.FINAL.jar
 	c) jdbc/mobicents-slee-ra-jdbc-DU-1.0.0.FINAL.jar
 
-3) Change "localSpc" property in jboss-5.1.0.GA/server/default/deploy/mobicents-ss7-service/META-INF/jboss-beans.xml to 1
-
-4) If you are deploying USSD Gateway from source code, set JBOSS_HOME variable to point to "ussd-mobicents-jainslee-2.6.0.FINAL-jboss-5.1.0.GA/jboss-5.1.0.GA" and execute "mvn clean install" command, it should create "mobicents-ussd-gateway" and ussdhttpdemo.war in /deploy folder of JBoss. 
+3) If you are deploying USSD Gateway from source code, set JBOSS_HOME variable to point to "ussd-mobicents-jainslee-2.6.0.FINAL-jboss-5.1.0.GA/jboss-5.1.0.GA" and execute "mvn clean install" command, it should create "mobicents-ussd-gateway" and ussdhttpdemo.war in /deploy folder of JBoss. 
 
 5) Execute below commands in SS7 CLI to setup SS7 
 
-	a) sctp association create Assoc1 CLIENT 127.0.0.1 2905 127.0.0.1 2904 
+	5.1) sctp association create Assoc1 CLIENT 127.0.0.1 8012 127.0.0.1 8011 
+
+	5.2) m3ua as create AS1 IPSP mode SE ipspType CLIENT rc 101 traffic-mode loadshare
 
-	b) m3ua as create AS1 AS mode SE rc 100 traffic-mode loadshare
+	5.3) m3ua asp create ASP1 Assoc1
 
-	c) m3ua asp create ASP1 Assoc1
+	5.4) m3ua as add AS1 ASP1
 
-	d) m3ua as add AS1 ASP1
+	5.5) m3ua route add AS1 2 -1 -1
 
-	e) m3ua route add AS1 2 -1 -1
+	5.6) m3ua asp start ASP1
 
-	f) m3ua asp start ASP1
+	5.7) sccp sap create 1 1 1 2
 
-	g) sccp rsp create 1 2 0 0
+	5.8) sccp rsp create 1 2 0 0
 
-	h) sccp rss create 1 2 8 0
+	5.9) sccp rss create 1 2 8 0
 
 6) Assuming mobicents ss7-simulator is started already you should see on jboss console "10:21:28,046 WARN  [SccpStackImpl-SccpStack] Rx : MTP-RESUME: AffectedDpc=2" indicating that USSD Gateway M3UA layer is now connected with ss7-simulator
 
-7) Dial *456# on ss7-simulator and you should see USSD getting exchanged between simulator and server
+7) Dial *519# on ss7-simulator and you should see USSD getting exchanged between simulator and server

core/bootstrap/pom.xml

@@ -24,19 +24,19 @@
 
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-domain</artifactId>
+			<artifactId>domain</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-rules</artifactId>
+			<artifactId>rules</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-xml</artifactId>
+			<artifactId>xml</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 
@@ -152,10 +152,46 @@
 			<groupId>org.mobicents.protocols.ss7.sccp</groupId>
 			<version>${ss7.version}</version>
 		</dependency>
+
+		<!-- MAP -->
+		<dependency>
+			<artifactId>map-api</artifactId>
+			<groupId>org.mobicents.protocols.ss7.map</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>map-impl</artifactId>
+			<groupId>org.mobicents.protocols.ss7.map</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+
+		<!-- TCAP -->
+		<dependency>
+			<artifactId>tcap-api</artifactId>
+			<groupId>org.mobicents.protocols.ss7.tcap</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>tcap-impl</artifactId>
+			<groupId>org.mobicents.protocols.ss7.tcap</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+
+		<!-- ISUP -->
+		<dependency>
+			<artifactId>isup-api</artifactId>
+			<groupId>org.mobicents.protocols.ss7.isup</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>isup-impl</artifactId>
+			<groupId>org.mobicents.protocols.ss7.isup</groupId>
+			<version>${ss7.version}</version>
+		</dependency>				
 
 		<!-- SLEE DU -->
 		<dependency>
-			<artifactId>ussdgateway-services-DU</artifactId>
+			<artifactId>services-DU</artifactId>
 			<groupId>${pom.groupId}</groupId>
 			<version>${pom.version}</version>
 		</dependency>

core/bootstrap/src/main/assembly/descriptor.xml

@@ -22,7 +22,7 @@
 			<scope>runtime</scope>
 			<includes>
 				<!-- SLEE DU -->
-				<include>org.mobicents.ussd:ussdgateway-services-DU</include>
+				<include>org.mobicents.ussd:services-DU</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
@@ -36,8 +36,8 @@
 				<include>org.mobicents.ussd:xml</include>
 
 				<!-- rules and domain library -->
-				<include>org.mobicents.ussd:ussdgateway-rules</include>
-				<include>org.mobicents.ussd:ussdgateway-domain</include>
+				<include>org.mobicents.ussd:rules</include>
+				<include>org.mobicents.ussd:domain</include>
 
 
 				<!-- Not strictly SS7, But needed by SS7 -->
@@ -51,6 +51,12 @@
 				<!-- SS7 Libraries -->
 				<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>
+				<include>org.mobicents.protocols.ss7.isup:isup-impl</include>
+				<include>org.mobicents.protocols.ss7.tcap:tcap-api</include>
+				<include>org.mobicents.protocols.ss7.tcap:tcap-impl</include>
+				<include>org.mobicents.protocols.ss7.map:map-api</include>
+				<include>org.mobicents.protocols.ss7.map:map-impl</include>												
 				<include>org.mobicents.protocols.ss7.m3ua:m3ua-api</include>
 				<include>org.mobicents.protocols.ss7.m3ua:m3ua-impl</include>
 				<include>org.mobicents.protocols.ss7.mtp:mtp</include>

core/bootstrap/src/main/config/META-INF/jboss-beans.xml

@@ -21,6 +21,7 @@
 		<constructor>
 			<parameter>Mtp3UserPart</parameter>
 		</constructor>
+		<property name="maxSequenceNumber">256</property>
 		<property name="persistDir">${jboss.server.data.dir}</property>
 		<property name="transportManagement">
 			<inject bean="SCTPManagement" />
@@ -48,17 +49,22 @@
 	<!-- SCCP Service -->
 	<!-- ==================================================================== -->
 	<bean name="SccpStack" class="org.mobicents.protocols.ss7.sccp.impl.SccpStackImpl">
-                <constructor>
-                        <parameter>SccpStack</parameter>
-                </constructor>
-                <property name="localSpc">833</property>
-                <property name="ni">2</property>
-                <property name="persistDir">${jboss.server.data.dir}</property>
-                <property name="removeSpc">true</property>
-                <property name="mtp3UserPart">
-                        <inject bean="Mtp3UserPart" />
-                </property>
-    </bean>
+		<constructor>
+			<parameter>SccpStack</parameter>
+		</constructor>
+		<property name="persistDir">${jboss.server.data.dir}</property>
+		<property name="removeSpc">true</property>
+		<property name="mtp3UserParts">
+			<map keyClass="java.lang.Integer" valueClass="org.mobicents.protocols.ss7.mtp.Mtp3UserPart">
+				<entry>
+					<key>1</key>
+					<value>
+						<inject bean="Mtp3UserPart" />
+					</value>
+				</entry>
+			</map>
+		</property>
+	</bean>
 
 	<bean name="SccpExecutor"
 		class="org.mobicents.protocols.ss7.sccp.impl.oam.SccpExecutor">
@@ -67,6 +73,32 @@
 		</property>
 	</bean>
 
+	<!-- ==================================================================== -->
+	<!-- TCAP Service -->
+	<!-- ==================================================================== -->
+	<bean name="TcapStack" class="org.mobicents.protocols.ss7.tcap.TCAPStackImpl">
+		<constructor>
+			<parameter>
+				<inject bean="SccpStack" property="sccpProvider" />
+			</parameter>
+			<parameter>8</parameter>
+		</constructor>
+		<property name="dialogIdleTimeout">60000</property>
+		<property name="invokeTimeout">30000</property>
+		<property name="maxDialogs">25000</property>
+	</bean>
+
+	<!-- ==================================================================== -->
+	<!-- MAP Service -->
+	<!-- ==================================================================== -->
+	<bean name="MapStack" class="org.mobicents.protocols.ss7.map.MAPStackImpl">
+		<constructor>
+			<parameter>
+				<inject bean="TcapStack" property="provider" />
+			</parameter>
+		</constructor>
+	</bean>
+
 	<!-- ==================================================================== -->
 	<!-- Shell Service -->
 	<!-- ==================================================================== -->
@@ -82,18 +114,19 @@
 			<inject bean="M3UAShellExecutor" />
 		</property>
 	</bean>
+
 	<!-- ==================================================================== -->
 	<!-- Mobicents SS7 Service -->
 	<!-- ==================================================================== -->
 	<bean name="SS7Service" class="org.mobicents.applications.ussd.bootstrap.SS7Service">
 		<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="org.mobicents.ss7:service=SS7Service",exposedInterface=org.mobicents.applications.ussd.bootstrap.SS7ServiceMBean.class,registerDirectly=true)
 		</annotation>
-		<property name="jndiName">java:/mobicents/ss7/sccp</property>
+		<property name="jndiName">java:/mobicents/ss7/map</property>
 		<property name="stack">
-			<inject bean="SccpStack" property="sccpProvider" />
+			<inject bean="MapStack" property="MAPProvider" />
 		</property>
 	</bean>
-	
+
 	<!-- ==================================================================== -->
 	<!-- JBoss Rules Service -->
 	<!-- ==================================================================== -->

core/bootstrap/src/main/java/org/mobicents/applications/ussd/bootstrap/SS7Service.java

@@ -59,7 +59,7 @@ public String getSS7Name() {
 		if (name != null) {
 			return name;
 		} else {
-			return "Mobicents SMSC";
+			return "Mobicents USSD";
 		}
 	}
 

core/domain/pom.xml

@@ -14,7 +14,7 @@
 	<packaging>jar</packaging>
 
 
-	<artifactId>ussdgateway-domain</artifactId>
+	<artifactId>domain</artifactId>
 	<name>Core : Domain</name>
 	<description>USSD Gateway Domain Object</description>
 

core/rules/pom.xml

@@ -14,14 +14,14 @@
 	<packaging>jar</packaging>
 
 
-	<artifactId>ussdgateway-rules</artifactId>
+	<artifactId>rules</artifactId>
 	<name>Core : Rules</name>
 	<description>USSD Gateway Rules Service</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-domain</artifactId>
+			<artifactId>domain</artifactId>
 			<version>${pom.version}</version>
 			<scope>runtime</scope>
 		</dependency>

core/slee/library/pom.xml

@@ -4,25 +4,25 @@
 
 	<parent>
 		<groupId>org.mobicents.ussd</groupId>
-		<artifactId>ussdgateway-slee</artifactId>
+		<artifactId>slee</artifactId>
 		<version>1.0.0-SNAPSHOT</version> 
 	</parent>
 
-	<artifactId>ussdgateway-library</artifactId>
+	<artifactId>library</artifactId>
 	<name>Core : SLEE : Library</name>
 
 
 
 	<dependencies>
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-domain</artifactId>
+			<artifactId>domain</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 
 		<!-- xml -->
 		<dependency>
-			<artifactId>ussdgateway-xml</artifactId>
+			<artifactId>xml</artifactId>
 			<groupId>${pom.groupId}</groupId>
 			<version>${pom.version}</version>
 		</dependency>

core/slee/pom.xml

@@ -7,7 +7,7 @@
 		<version>1.0.0-SNAPSHOT</version> 
 	</parent>
 
-	<artifactId>ussdgateway-slee</artifactId>
+	<artifactId>slee</artifactId>
 	<name>Core : SLEE</name>
 	<packaging>pom</packaging>
 

core/slee/sbbs/pom.xml

@@ -4,17 +4,17 @@
 
 	<parent>
 		<groupId>org.mobicents.ussd</groupId>
-		<artifactId>ussdgateway-slee</artifactId>
+		<artifactId>slee</artifactId>
 		<version>1.0.0-SNAPSHOT</version> 
 	</parent>
 
-	<artifactId>ussdgateway-sbbs</artifactId>
+	<artifactId>sbbs</artifactId>
 	<name>Core : SLEE : Sbbs</name>
 	<dependencies>
 
 		<dependency>
 			<groupId>${pom.groupId}</groupId>
-			<artifactId>ussdgateway-library</artifactId>
+			<artifactId>library</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 		<dependency>