Fix for issue #7 (jSS7 configuration and run-time dependencies of tes…

…t module corrected, jSS7 version updated to 3.0.1324, MAP RA version updated to 2.8.17)”

README.md

@@ -40,14 +40,14 @@ cd ~
 mkdir RestComm
 cd RestComm
 # Download from https://mobicents.ci.cloudbees.com/job/Mobicents-JAIN-SLEE-Release/
-unzip ~/mobicents-slee-2.8.10.32.zip	
+unzip ~/mobicents-slee-2.8.12.36.zip	
 ```
 
 Setup JBOSS
 ```
 vi ~/.profile
 #
-JBOSS_HOME=/home/user/mobicents-slee-2.8.10.32/jboss-5.1.0.GA
+JBOSS_HOME=/home/user/mobicents-slee-2.8.12.36/jboss-5.1.0.GA
 export JBOSS_HOME
 #
 

pom.xml

@@ -37,11 +37,11 @@
 
 		<mobicents.core.ext.version>1.0.0.FINAL</mobicents.core.ext.version> <!-- this property is not used. same as mobicents.slee.api.extensions.version in parent -->
 
-		<mobicents.resources.map.version>2.8.16</mobicents.resources.map.version>
+		<mobicents.resources.map.version>2.8.17</mobicents.resources.map.version>
 
 		<jslee.ext.version>1.0.0.FINAL</jslee.ext.version> <!--different name but used for same dependency as mobicents.slee.api.extensions.version from parent -->
 
-		<ss7.version>3.0.1323</ss7.version>
+		<ss7.version>3.0.1324</ss7.version>
 		<!-- mobicents but not strictly ss7 -->
 		<asn.version>2.0.3.FINAL</asn.version>
 		<stream.version>1.0.0.CR1</stream.version>

test/README.txt

@@ -22,7 +22,7 @@ Port: 3000
 Configure SS7 on jEIR:
 1) Run the ss7-cli.sh (Mobicents SS7 Management Shell) and connect to TelScale CLI
 
-# cd mobicents-slee-2.8.10.32/extra/mobicents-ss7/mobicents-jss7-3.0.1322/ss7/shell/bin
+# cd mobicents-slee-2.8.12.36/extra/mobicents-ss7/mobicents-jss7-3.0.1322/ss7/shell/bin
 # ss7-cli.bat
 telscale>connect 127.0.0.1 3435
 Connected to TelScale CLI 3.0.1322 TeleStax Authenticating against configured security realm

test/bootstrap/pom.xml

@@ -16,13 +16,13 @@
 	<dependencies>
 		<!-- EIR Dependency -->
 		<dependency>
-			<groupId>org.mobicents.eir</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>test-mapmodule</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<!-- 
 		<dependency>
-			<groupId>org.mobicents.eir</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>test-oam</artifactId>
 			<version>${project.version}</version>
 		</dependency> -->
@@ -57,6 +57,32 @@
 			<groupId>org.jboss.aop</groupId>
 			<artifactId>jboss-aop</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-system-jmx</artifactId>
+			<version>${jboss.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-j2se</artifactId>
+			<version>${jboss.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-system</artifactId>
+			<version>${jboss.version}</version>
+		</dependency>
+		<!-- JBoss AS Security -->
+		<dependency>
+			<groupId>org.jboss.jbossas</groupId>
+			<artifactId>jboss-as-security</artifactId>
+			<version>${jboss.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.security</groupId>
+			<artifactId>jboss-security-spi</artifactId>
+			<version>2.0.3.SP1</version>
+		</dependency>
 
 		<!-- SS7 CLI -->
 
@@ -89,7 +115,22 @@
 			<version>${ss7.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-
+		<dependency>
+			<artifactId>shell-server-api</artifactId>
+			<groupId>org.mobicents.protocols.ss7.management</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>shell-server-impl</artifactId>
+			<groupId>org.mobicents.protocols.ss7.management</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+		<dependency>
+			<artifactId>shell-transport</artifactId>
+			<groupId>org.mobicents.protocols.ss7.management</groupId>
+			<version>${ss7.version}</version>
+		</dependency>
+
 	</dependencies>
 
 	<!-- -->

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

@@ -42,15 +42,15 @@
 			<outputDirectory>/lib</outputDirectory>
 			<outputFileNameMapping>mobicents-ss7-shell.jar</outputFileNameMapping>
 			<includes>
-				<include>org.mobicents.protocols.ss7.management:shell</include>
+				<include>org.mobicents.protocols.ss7.management:shell-client</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>
 			<outputDirectory>/lib</outputDirectory>
 			<unpack>false</unpack>
 			<scope>runtime</scope>
 			<excludes>
-				<exclude>org.mobicents.protocols.ss7.management:shell</exclude>
+				<exclude>*:tests</exclude>
 			</excludes>
 			<includes>
 				<!-- EIR libraries -->
@@ -66,6 +66,11 @@
 				<include>org.jboss.microcontainer:jboss-aop-mc-int</include>
 				<include>org.jboss.aop:jboss-aop</include>
 				<include>org.jboss:jboss-common-core</include>
+				<include>org.jboss.jbossas:jboss-as-system-jmx</include>
+				<include>org.jboss.jbossas:jboss-as-security</include>
+				<include>org.jboss.jbossas:jboss-as-system</include>
+				<include>org.jboss.security:jboss-security-spi</include>
+				<include>org.jboss.jbossas:jboss-as-j2se</include>
 				<include>urbanophile:java-getopt</include>
 				<include>org.jboss.logging:jboss-logging-spi</include>
 				<include>org.jboss:jboss-reflect</include>
@@ -95,17 +100,28 @@
 				<include>org.mobicents.protocols.ss7.mtp:mtp</include>
 				<include>org.mobicents.protocols.ss7.mtp:mtp-api</include>
 				<include>org.mobicents.protocols.ss7.hardware:linkset</include>
-				<include>org.mobicents.protocols.ss7.management:shell</include>
+				<include>org.mobicents.protocols.ss7.management:shell-transport</include>
+				<include>org.mobicents.protocols.ss7.management:shell-server-api</include>
+				<include>org.mobicents.protocols.ss7.management:shell-server-impl</include>
 				<!-- <include>org.mobicents.protocols.ss7.hardware:mobicents-dahdi</include> -->
 				<include>org.mobicents.protocols.ss7.hardware:mobicents-dialogic
 				</include>
 				<include>org.mobicents.protocols.ss7.congestion:congestion
 				</include>
+				<include>org.mobicents.protocols.ss7.statistics:statistics-api</include>
+				<include>org.mobicents.protocols.ss7.statistics:statistics-impl</include>
 				<!-- SS7 OAM Cli Libraries -->
 				<include>org.jboss.jreadline:jreadline</include>
 				<include>org.mobicents.protocols.ss7.m3ua:m3ua-cli-sctp</include>
 				<include>org.mobicents.protocols.ss7.m3ua:m3ua-cli-m3ua</include>
 				<include>org.mobicents.protocols.ss7.sccp:sccp-cli</include>
+
+				<!-- Mobicents licensing lib -->
+				<include>org.mobicents.licensing:lce-core</include>
+				<include>org.mobicents.licensing:lce-common:jar:jar-with-dependencies</include>
+				<include>org.mobicents.licensing:lce-secret:jar:obfuscated</include>
+				<include>org.mobicents.licensing:lce-notify</include>
+				<include>org.apache.commons:commons-email</include>
 			</includes>
 		</dependencySet>
 	</dependencySets>

test/bootstrap/src/main/config/data/Mtp3UserPart_m3ua.xml → test/bootstrap/src/main/config/data/Mtp3UserPart_m3ua1.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<heartbeattime value="10000"/>
 <aspFactoryList>
-	<aspFactory name="ASP1" assocName="SCTPAssoc1" started="true" maxseqnumber="256" aspid="3"/>
+	<aspFactory name="ASP1" assocName="SCTPAssoc1" started="true" maxseqnumber="256" aspid="3" heartbeat="false"/>
 </aspFactoryList>
 <asList>
 	<as name="AS1" minAspActiveForLb="1" functionality="IPSP" exchangeType="SE" ipspType="SERVER">
@@ -16,5 +17,5 @@
 </asList>
 <route>
 	<key value="1:-1:-1"/>
-	<value value="AS1"/>
+	<routeAs trafficModeType="2" as="AS1"/>
 </route>

test/bootstrap/src/main/config/data/SccpStack_sccpresource2.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<remoteSsns>
+	<id value="1"/>
+	<value remoteSpc="1" remoteSsn="9" remoteSsnFlag="0" markProhibitedWhenSpcResuming="false"/>
+</remoteSsns>
+<remoteSpcs>
+	<id value="1"/>
+	<value remoteSpc="1" remoteSpcFlag="0" mask="0"/>
+</remoteSpcs>
+<concernedSpcs/>

test/bootstrap/src/main/config/data/SccpStack_sccprouter2.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<rule>
+	<id value="1"/>
+	<value ruleType="Solitary" loadSharingAlgo="Undefined" originatingType="All" mask="K" paddress="1" saddress="-1" networkId="0">
+		<patternSccpAddress pc="0" ssn="8">
+			<ai value="18"/>
+			<gt type="GT0100" tt="0" es="2" np="1" nai="4" digits="553496629938"/>
+		</patternSccpAddress>
+	</value>
+	<id value="2"/>
+	<value ruleType="Solitary" loadSharingAlgo="Undefined" originatingType="All" mask="K" paddress="2" saddress="-1" networkId="0">
+		<patternSccpAddress pc="0" ssn="9">
+			<ai value="18"/>
+			<gt type="GT0100" tt="0" es="2" np="1" nai="4" digits="*"/>
+		</patternSccpAddress>
+	</value>
+</rule>
+<routingAddress>
+	<id value="1"/>
+	<sccpAddress pc="2" ssn="8">
+		<ai value="19"/>
+		<gt type="GT0100" tt="0" es="2" np="1" nai="4" digits="553496629938"/>
+	</sccpAddress>
+	<id value="2"/>
+	<sccpAddress pc="1" ssn="-1">
+		<ai value="19"/>
+		<gt type="GT0100" tt="0" es="1" np="1" nai="4" digits="-"/>
+	</sccpAddress>
+</routingAddress>
+<longMessageRule/>
+<sap>
+	<id value="1"/>
+	<value mtp3Id="1" opc="2" ni="2" networkId="0">
+		<mtp3DestinationMap>
+			<id value="1"/>
+			<value firstDpc="1" lastDpc="1" firstSls="0" lastSls="255" slsMask="255"/>
+		</mtp3DestinationMap>
+	</value>
+</sap>

test/bootstrap/src/main/config/oam-beans.xml

@@ -17,6 +17,7 @@
 					<inject bean="SccpExecutor" />
 					<inject bean="M3UAShellExecutor" />
 					<inject bean="SCTPShellExecutor" />
+					<inject bean="TcapExecutor" />
 				</list>
 			</parameter>
 		</constructor>

test/bootstrap/src/main/config/run.bat

@@ -1,6 +1,6 @@
 @echo off
 rem -------------------------------------------------------------------------
-rem Mobicents Media Server Bootstrap Script for Win32
+rem Mobicents Equipment Identity Register Bootstrap Script for Win32
 rem -------------------------------------------------------------------------
 
 rem $Id: run.bat,v 1.5 2007/08/07 10:15:40 baranowb Exp $
@@ -14,15 +14,15 @@ set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
 pushd %DIRNAME%..
-set MMS_HOME=%CD%
+set EIR_HOME=%CD%
 echo ========
-echo %MMS_HOME%
+echo %EIR_HOME%
 
 popd
 
 REM Add bin/native to the PATH if present
-if exist "%MMS_HOME%\native" set PATH=%MMS_HOME%\native;%PATH%
-if exist "%MMS_HOME%\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%PATH%"
+if exist "%EIR_HOME%\native" set PATH=%EIR_HOME%\native;%PATH%
+if exist "%EIR_HOME%\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path="%PATH%"
 
 REM Run section  - here we define node and default ip
 set IP=127.0.0.1
@@ -55,7 +55,7 @@ set ARGS=""
 
 rem Find run.jar, or we can't continue
 
-set RUNJAR=%MMS_HOME%\bin\run.jar
+set RUNJAR=%EIR_HOME%\bin\run.jar
 if exist "%RUNJAR%" goto FOUND_RUN_JAR
 echo Could not locate %RUNJAR%. Please check that you are in the
 echo bin directory when running this script.
@@ -89,10 +89,10 @@ rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this will
 rem result in including the local directory in the classpath, which makes
 rem error tracking harder.
 if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%MMS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%MMS_CLASSPATH%;%RUNJAR%
+if "%EIR_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%EIR_CLASSPATH%;%RUNJAR%
 
-set MMS_CLASSPATH=%RUN_CLASSPATH%
+set EIR_CLASSPATH=%RUN_CLASSPATH%
 
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME% 
@@ -115,28 +115,28 @@ rem JPDA options. Uncomment and modify as appropriate to enable remote debugging
 rem set JAVA_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
 
 rem Setup the java endorsed dirs
-set MMS_ENDORSED_DIRS=%MMS_HOME%\lib
+set EIR_ENDORSED_DIRS=%EIR_HOME%\lib
 
 
 echo ===============================================================================
 echo.
-echo   Mobicents SMSC Gateway Test Server Bootstrap Environment
+echo   Mobicents Equipment Identity Register Test Server Bootstrap Environment
 echo.
-echo   MMS_HOME: %MMS_HOME%
+echo   EIR_HOME: %EIR_HOME%
 echo.
 echo   JAVA: %JAVA%
 echo.
 echo   JAVA_OPTS: %JAVA_OPTS%
 echo.
-echo   CLASSPATH: %MMS_CLASSPATH%
+echo   CLASSPATH: %EIR_CLASSPATH%
 echo   
-echo   MMS_ENDORSED_DIRS: %MMS_ENDORSED_DIRS%
+echo   EIR_ENDORSED_DIRS: %EIR_ENDORSED_DIRS%
 echo.
 echo ===============================================================================
 echo.
 
 :RESTART
-"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%MMS_ENDORSED_DIRS%" -Dmbrola.base="%MMS_HOME%/mbrola" -classpath "%MMS_CLASSPATH%" org.mobicents.media.server.bootstrap.Main %*
+"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%EIR_ENDORSED_DIRS%" -classpath "%EIR_CLASSPATH%" org.mobicents.eir.server.bootstrap.Main %*
 rem if ERRORLEVEL 10 goto RESTART
 
 :END