SLh and SLg resource adaptors implementation

.gitignore

@@ -1,30 +1,125 @@
-# Java compiled #
-#################
+##############################
+## Java
+##############################
+.mtj.tmp/
 *.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
 
-# Eclipse #
-###########
-.classpath
-.project
-.settings
+##############################
+## Maven
+##############################
+~
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+# ignore mvn-rpmbuild repo
+/.m2
+
+##############################
+## Gradle
+##############################
+bin/
+build/
+.gradle
+.gradletasknamecache
+gradle-app.setting
+!gradle-wrapper.jar
 
-# IntelliJ IDEA #
-#################
+##############################
+## IntelliJ IDEA
+##############################
+out/
 .idea/
+.idea_modules/
 *.iml
+*.ipr
 *.iws
+.idea
 
-# Maven #
-#########
-target
+##############################
+## Eclipse
+##############################
+.settings/
+bin/
+tmp/
+.metadata
+.classpath
+.project
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+.factorypath
 
-# OS generated files #
-######################
+##############################
+## NetBeans
+##############################
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+catalog.xml
+
+##############################
+## Visual Studio Code
+##############################
+.vscode/
+
+##############################
+## OS X
+##############################
 .DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
+
+##############################
+## Generated directories
+##############################
+logs/
+LICENSE4J-Runtime-Library/
+
+# ignore .svn metadata files
+.svn
+
+
+maven-ant-tasks.jar
+test-output
+transaction.log
+
+# vim files
+*.swp
+/.gitk-tmp.*
+atlassian-ide-plugin.xml
+
+# temp files
+*~
+
+# hprof dumps
+/*.hprof
+# ignore 'randomly' strewn around logs
+server.log
+
+# H2 databases produced by tests
+*.h2.db
+
+# JBoss transaction generated files
+PutObjectStoreDirHere
+
+/bin
+/HtppSimulatorParameters.xml
+

Jenkinsfile

@@ -0,0 +1,93 @@
+pipeline {
+	agent any
+
+	tools {
+	    jdk 'JDK 11'
+		maven 'Maven_3.6.3'
+	}
+
+	options {
+    	buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '10'))
+  	}
+
+
+	parameters {
+        string(name: 'JSLEE_DIAMETER_MAJOR_VERSION_NUMBER', defaultValue: '7.2.1', description: 'The major version for RestComm JAIN SLEE Diameter')
+        string(name: 'RESTCOMM_JDIAMETER_VERSION', defaultValue: '1.7.4-198', description: 'The version of RestComm jDiameter to use for build')
+    }
+
+	stages{
+		stage('Set Version') {
+			steps {
+				sh "mvn versions:set -DnewVersion=${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+			}
+		}
+
+		stage("Build") {
+			steps {
+				echo "Building application..."
+				script {
+                    currentBuild.displayName = "#${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+                    currentBuild.description = "RestComm JAIN SLEE Diameter"
+                }
+				sh "mvn -Drestcomm.diameter.jdiameter.version=${params.RESTCOMM_JDIAMETER_VERSION} -Drestcomm.diameter.mux.version=${params.RESTCOMM_JDIAMETER_VERSION} clean install -DskipTests"
+				echo "Maven build completed."
+			}
+		}
+
+		stage("Release") {
+			steps {
+				echo "Building a release version of #${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+        		sh "mvn clean install -Drestcomm.diameter.jdiameter.version=${params.RESTCOMM_JDIAMETER_VERSION} -Drestcomm.diameter.mux.version=${params.RESTCOMM_JDIAMETER_VERSION} -DskipTests -Prelease-wildfly -Drelease.dir=../../../deploy-${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+				echo "Building a release version completed."
+			}
+		}
+
+		stage('Save Artifacts') {
+           //when { anyOf { branch 'release'; branch 'master' }}
+            steps {
+               echo "Archiving RestComm JAIN SLEE Diameter version ${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+               archiveArtifacts artifacts: "deploy-${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}/", followSymlinks: false, onlyIfSuccessful: true
+            }
+        }
+
+        stage('Push Artifacts'){
+            when{ anyOf { branch 'release'; branch 'master' }}
+            steps{
+                script{
+                    FOLDERNAME = "${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"
+                }
+                dir("deploy-${params.JSLEE_DIAMETER_MAJOR_VERSION_NUMBER}-${BUILD_NUMBER}"){
+                    sh 'find resources/* -maxdepth 1 -type d -exec zip -r -qq {}.zip {} \\;'
+                    sh "mkdir ${FOLDERNAME}"
+                    sh "find resources/* -iname \"*.zip\" -exec mv {} ${FOLDERNAME}/ \\;"
+
+                    sshagent(['ssh_grafana']) {
+                       sh "scp -r ${FOLDERNAME} [email protected]:/var/www/html/FerUy/jain_slee_diameter"
+                    }
+                    sh "rm -rf ${FOLDERNAME}"
+                }
+            }
+        }
+
+        stage('jFrog'){
+            when { anyOf { branch 'release'; branch 'master'}}
+            steps{
+                sh 'mvn deploy -DskipTests'
+            }
+        }
+    }
+
+	post {
+		success {
+			echo "Successfully build"
+		}
+		failure {
+			echo "Building RestComm JAIN SLEE Diameter failed."
+		}
+		always {
+            sh 'rm -rf deploy'
+			echo 'The deploy folder is removed successfully'
+		}
+	}
+}

README.md

@@ -20,18 +20,11 @@ The following Diameter applications are natively supported
 - Diameter Rx (3GPP TS 29.214)
 - Diameter S6a/S6d (3GPP TS 29.272)
 - Diameter S13 (3GPP TS 29.272)
+- Diameter SLh (3GPP TS 29.173)
+- Diameter SLg (3GPP TS 29.172)
 
 ## Questions ?
 
 Please ask your question on [StackOverflow](http://stackoverflow.com/questions/tagged/restcomm) or the 
 [Google Groups mailing list](http://groups.google.com/group/restcomm).
 
-
-## License
-
-RestComm is lead by [TeleStax](http://www.telestax.com/), Inc. and developed collaboratively by a community of individual 
-and enterprise contributors.
-
-RestComm is licensed under dual license policy. The default license is the Free Open Source GNU Affero GPL v3.0. 
-Alternatively a commercial license can be obtained from Telestax 
-([contact form](https://www.restcomm.com/contact/))

enablers/hss-client/docs/jdocbook-restcomm/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client-docs</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-docs-jdocbook-restcomm</artifactId>
@@ -58,9 +58,9 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>hss-client-docs-sources-restcomm</artifactId>
-									<version>${pom.version}</version>
+									<version>${project.version}</version>
 									<type>jar</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/docbook/resources</outputDirectory>

enablers/hss-client/docs/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-docs</artifactId>

enablers/hss-client/docs/sources-restcomm/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client-docs</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-docs-sources-restcomm</artifactId>	
@@ -40,9 +40,9 @@
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>${pom.groupId}</groupId>
+									<groupId>${project.groupId}</groupId>
 									<artifactId>hss-client-docs-sources</artifactId>
-									<version>${pom.version}</version>
+									<version>${project.version}</version>
 									<type>jar</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${basedir}/src/main/resources</outputDirectory>

enablers/hss-client/docs/sources/pom.xml

@@ -6,7 +6,7 @@
     <parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client-docs</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-docs-sources</artifactId>

enablers/hss-client/du/pom.xml

@@ -4,16 +4,16 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-DU</artifactId>
 
 	<dependencies>
 		<dependency>
-			<groupId>${pom.groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>hss-client-sbb</artifactId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 

enablers/hss-client/example/du/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client-example</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-example-DU</artifactId>

enablers/hss-client/example/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-example</artifactId>

enablers/hss-client/example/sbb/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client-example</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-example-sbb</artifactId>

enablers/hss-client/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.diameter</groupId>
 		<artifactId>restcomm-slee-diameter</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

enablers/hss-client/release/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-release</artifactId>

enablers/hss-client/sbb/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.mobicents.servers.jainslee.enablers</groupId>
 		<artifactId>hss-client</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
+		<version>7.2.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hss-client-sbb</artifactId>