From 96f2574bbb7e20cc06bf37f4b88a8877904638f0 Mon Sep 17 00:00:00 2001
From: Anatoly Satanovskiy <anatoly.satanovskiy@mobius-software.com>
Date: Fri, 3 Nov 2017 12:40:05 +0200
Subject: [PATCH] smsc wildfly compatibility changes

---
 .../src/main/assemble/descriptor.xml          |  20 +++-
 .../restcomm/smpp/extension/SubsystemAdd.java |   3 +-
 .../restcomm/smpp/service/SmppService.java    | 101 +++++++++++-------
 .../smpp/service/SmppServiceInterface.java    |  10 ++
 .../src/main/module/module.xml                |   9 +-
 .../lib/smpp-cli-7.1.0-SNAPSHOT.jar           | Bin 0 -> 21862 bytes
 release/release-build-wildfly.xml             |   8 +-
 release/wildfly-smpp-subsystem.txt            |   2 +-
 8 files changed, 98 insertions(+), 55 deletions(-)
 create mode 100644 core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppServiceInterface.java
 create mode 100644 core/oam/clismpp/${env.JBOSS_HOME}/lib/smpp-cli-7.1.0-SNAPSHOT.jar

diff --git a/core/bootstrap-wildfly/src/main/assemble/descriptor.xml b/core/bootstrap-wildfly/src/main/assemble/descriptor.xml
index 1a4eb17..08d7327 100644
--- a/core/bootstrap-wildfly/src/main/assemble/descriptor.xml
+++ b/core/bootstrap-wildfly/src/main/assemble/descriptor.xml
@@ -17,10 +17,20 @@
     </fileSets>
 
     <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-        </dependencySet>
-    </dependencySets>
+		<dependencySet>
+			<outputDirectory>/</outputDirectory>
+			<unpack>false</unpack>
+			<scope>runtime</scope>
+			<includes>
+				<include>org.restcomm.smpp:ch-smpp</include>
+				<include>org.restcomm.smpp:ch-commons-util</include>
+				<include>org.restcomm.smpp:ch-commons-charset</include>
+				<include>org.restcomm.smpp:bootstrap-wildfly</include>
+				<include>joda-time:joda-time</include>
+				<include>io.netty:netty</include>
+				<include>org.restcomm.smpp:smpp-extensions</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
 
 </assembly>
\ No newline at end of file
diff --git a/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/extension/SubsystemAdd.java b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/extension/SubsystemAdd.java
index be7d3e2..27f4034 100644
--- a/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/extension/SubsystemAdd.java
+++ b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/extension/SubsystemAdd.java
@@ -14,6 +14,7 @@
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
 import org.restcomm.smpp.service.SmppService;
+import org.restcomm.smpp.service.SmppServiceInterface;
 
 import javax.management.MBeanServer;
 import java.util.List;
@@ -51,7 +52,7 @@ public void performBoottime(OperationContext context, ModelNode operation, Model
         service.setModel(fullModel);
 
         ServiceName name = SmppService.getServiceName();
-        ServiceController<SmppService> controller = context.getServiceTarget()
+        ServiceController<SmppServiceInterface> controller = context.getServiceTarget()
                 .addService(name, service)
                 .addDependency(PathManagerService.SERVICE_NAME, PathManager.class, service.getPathManagerInjector())
                 .addDependency(MBeanServerService.SERVICE_NAME, MBeanServer.class, service.getMbeanServer())
diff --git a/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppService.java b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppService.java
index 79192e3..18684c1 100644
--- a/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppService.java
+++ b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppService.java
@@ -18,7 +18,7 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-public class SmppService implements Service<SmppService> {
+public class SmppService implements SmppServiceInterface,Service<SmppServiceInterface> {
 
     public static final SmppService INSTANCE = new SmppService();
 
@@ -40,7 +40,7 @@ public InjectedValue<MBeanServer> getMbeanServer() {
     private static final String DATA_DIR = "jboss.server.data.dir";
 
     private ModelNode fullModel;
-
+    
     private Scheduler schedulerMBean = null;
     private SmppManagement smppManagementMBean = null;
     private SmppShellExecutor smppShellExecutor = null;
@@ -101,31 +101,14 @@ public void start(StartContext context) throws StartException {
         log.info("Starting SmppExtension Service");
 
         String dataDir = pathManagerInjector.getValue().getPathEntry(DATA_DIR).resolvePath();
-
-        // ss7Clock
-        DefaultClock ss7Clock = null;
-        try {
-            ss7Clock = new DefaultClock();
-        } catch (Exception e) {
-            log.warn("SS7Clock MBean creating is failed: " + e);
-        }
-
-        // schedulerMBean
-        schedulerMBean = null;
-        try {
-            schedulerMBean = new Scheduler();
-            schedulerMBean.setClock(ss7Clock);
-        } catch (Exception e) {
-            log.warn("SS7Scheduler MBean creating is failed: " + e);
-        }
-
+        
         // smppManagementMBean
         smppManagementMBean = SmppManagement.getInstance("SmppManagement");
         smppManagementMBean.setMbeanServer(getMbeanServer().getValue());
         smppManagementMBean.setPersistDir(dataDir);
         smppManagementMBean.start();
         registerMBean(smppManagementMBean, "org.restcomm.smpp:name=SmppManagement");
-
+        
         smppShellExecutor = null;
         try {
             smppShellExecutor = new SmppShellExecutor();
@@ -133,34 +116,65 @@ public void start(StartContext context) throws StartException {
         } catch (Exception e) {
             log.warn("SccpExecutor MBean creating is failed: " + e);
         }
+        
+        System.out.println("SMPP shellExecutorExists():" + shellExecutorExists());
+        
+        if(shellExecutorExists()) {
+        	// ss7Clock
+            DefaultClock ss7Clock = null;
+            try {
+                ss7Clock = new DefaultClock();
+            } catch (Exception e) {
+                log.warn("SS7Clock MBean creating is failed: " + e);
+            }
 
-        shellExecutorMBean = null;
-        try {
-            FastList<ShellExecutor> shellExecutors = new FastList<ShellExecutor>();
-            shellExecutors.add(smppShellExecutor);
+            // schedulerMBean
+            schedulerMBean = null;
+            try {
+                schedulerMBean = new Scheduler();
+                schedulerMBean.setClock(ss7Clock);
+            } catch (Exception e) {
+                log.warn("SS7Scheduler MBean creating is failed: " + e);
+            }
 
-            String address = getPropertyString("ShellExecutor", "address", "127.0.0.1");
-            int port = getPropertyInt("ShellExecutor", "port", 3435);
-            String securityDomain = getPropertyString("ShellExecutor", "securityDomain", "jmx-console");
+            shellExecutorMBean = null;
+            try {
+                FastList<ShellExecutor> shellExecutors = new FastList<ShellExecutor>();
+                shellExecutors.add(smppShellExecutor);
+
+                String address = getPropertyString("ShellExecutor", "address", "127.0.0.1");
+                int port = getPropertyInt("ShellExecutor", "port", 3436);
+                String securityDomain = getPropertyString("ShellExecutor", "securityDomain", "jmx-console");
+
+                shellExecutorMBean = new ShellServerWildFly(schedulerMBean, shellExecutors);
+                shellExecutorMBean.setAddress(address);
+                shellExecutorMBean.setPort(port);
+                shellExecutorMBean.setSecurityDomain(securityDomain);
+            } catch (Exception e) {
+                throw new StartException("ShellExecutor MBean creating is failed: " + e.getMessage(), e);
+            }
 
-            shellExecutorMBean = new ShellServerWildFly(schedulerMBean, shellExecutors);
-            shellExecutorMBean.setAddress(address);
-            shellExecutorMBean.setPort(port);
-            shellExecutorMBean.setSecurityDomain(securityDomain);
-        } catch (Exception e) {
-            throw new StartException("ShellExecutor MBean creating is failed: " + e.getMessage(), e);
+            // starting
+            try {
+                schedulerMBean.start();
+                shellExecutorMBean.start();
+            } catch (Exception e) {
+                throw new StartException("MBeans starting is failed: " + e.getMessage(), e);
+            }
         }
-
-        // starting
+        
         try {
-            schedulerMBean.start();
             smppShellExecutor.start();
-            shellExecutorMBean.start();
         } catch (Exception e) {
             throw new StartException("MBeans starting is failed: " + e.getMessage(), e);
         }
     }
 
+    private boolean shellExecutorExists() {
+        ModelNode shellExecutorNode = peek(fullModel, "mbean", "ShellExecutor");
+        return shellExecutorNode != null;
+    }
+    
     @Override
     public void stop(StopContext context) {
         log.info("Stopping SmppExtension Service");
@@ -184,11 +198,20 @@ private void registerMBean(Object mBean, String name) throws StartException {
         }
     }
 
-    private void unregisterMBean(String name) {
+    @SuppressWarnings("unused")
+	private void unregisterMBean(String name) {
         try {
             getMbeanServer().getValue().unregisterMBean(new ObjectName(name));
         } catch (Throwable e) {
             log.error("failed to unregister mbean", e);
         }
     }
+
+	public SmppShellExecutor getSmppShellExecutor() {
+		return smppShellExecutor;
+	}
+    
+	public SmppManagement getSmppManagementMBean() {
+		return smppManagementMBean;
+	}
 }
diff --git a/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppServiceInterface.java b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppServiceInterface.java
new file mode 100644
index 0000000..1cf6fcf
--- /dev/null
+++ b/core/bootstrap-wildfly/src/main/java/org/restcomm/smpp/service/SmppServiceInterface.java
@@ -0,0 +1,10 @@
+package org.restcomm.smpp.service;
+
+import org.restcomm.smpp.SmppManagement;
+import org.restcomm.smpp.oam.SmppShellExecutor;
+
+public interface SmppServiceInterface 
+{
+	public SmppShellExecutor getSmppShellExecutor();	
+	public SmppManagement getSmppManagementMBean();		
+}
diff --git a/core/bootstrap-wildfly/src/main/module/module.xml b/core/bootstrap-wildfly/src/main/module/module.xml
index e5772ce..ec05444 100644
--- a/core/bootstrap-wildfly/src/main/module/module.xml
+++ b/core/bootstrap-wildfly/src/main/module/module.xml
@@ -9,12 +9,6 @@
         <resource-root path="ch-commons-util-${ch-commons-util.version}.jar"/>
         <resource-root path="ch-smpp-${ch.smpp.version}.jar"/>
 
-        <resource-root path="scheduler-${jss7.restcomm.version}.jar"/>
-        <resource-root path="shell-server-api-${jss7.restcomm.version}.jar"/>
-        <resource-root path="shell-server-impl-${jss7.restcomm.version}.jar"/>
-        <resource-root path="shell-transport-${jss7.restcomm.version}.jar"/>
-
-        <resource-root path="javolution-${javolution.version}.jar"/>
         <resource-root path="netty-${netty.version}.jar"/>
         <resource-root path="joda-time-${joda-time.version}.jar"/>
     </resources>
@@ -36,5 +30,6 @@
         <module name="org.jboss.msc"/>
         <module name="org.jboss.logging"/>
         <module name="org.slf4j"/>
+        <module name="org.mobicents.ss7.commons"/>
     </dependencies>
-</module>
+</module>
\ No newline at end of file
diff --git a/core/oam/clismpp/${env.JBOSS_HOME}/lib/smpp-cli-7.1.0-SNAPSHOT.jar b/core/oam/clismpp/${env.JBOSS_HOME}/lib/smpp-cli-7.1.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..26aeff716953a97b66435edb120bfefc983fa24d
GIT binary patch
literal 21862
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
JG7T)9?mwNi`{@7x

literal 0
HcmV?d00001

diff --git a/release/release-build-wildfly.xml b/release/release-build-wildfly.xml
index ca80282..21c2a61 100644
--- a/release/release-build-wildfly.xml
+++ b/release/release-build-wildfly.xml
@@ -49,7 +49,7 @@
 
 		<!-- adding of ss7 subsystem into standalone.xml -->
 		<xmltask source="${jboss.standalone.path}/configuration/standalone.xml" dest="${jboss.standalone.path}/configuration/standalone.xml">
-			<remove path="/:server/:profile/*[local-name()='subsystem'][*[local-name()='mbean'][@reflection]]"/>
+			<remove path="/:server/:profile/*[local-name()='subsystem'][*[local-name()='mbean'][namespace-uri()='urn:org.restcomm:smpp-extensions:1.0'][@reflection]]"/>
 			<insert path="/:server/:profile/*[local-name()='subsystem'][last()]" position="after" file="template/wildfly-smpp-subsystem.txt"></insert>
 		</xmltask> 
 
@@ -78,6 +78,10 @@
 			</fileset>			
 		</copy>
 
+		<!-- Copy SS7 commons modules -->
+		<ant antfile="${jboss.home}/../extra/restcomm-ss7/ss7-wildfly/build.xml" target="deploy-commons">
+			<property name="basedir" value="${jboss.home}/../extra/restcomm-ss7/ss7-wildfly" />	
+		</ant>
 	</target>
 
 	<target name="undeploy">
@@ -91,7 +95,7 @@
 		</xmltask>
 
 		<xmltask source="${jboss.standalone.path}/configuration/standalone.xml" dest="${jboss.standalone.path}/configuration/standalone.xml">
-			<remove path="/:server/:profile/*[local-name()='subsystem'][*[local-name()='mbean'][@name='SS7Clock']]"/>
+			<remove path="/:server/:profile/*[local-name()='subsystem'][*[local-name()='mbean'][namespace-uri()='urn:org.restcomm:smpp-extensions:1.0']]"/>
 		</xmltask>
 
 		<delete dir="${restcomm-smpp.path}" />
diff --git a/release/wildfly-smpp-subsystem.txt b/release/wildfly-smpp-subsystem.txt
index 3166d3b..bea28e4 100644
--- a/release/wildfly-smpp-subsystem.txt
+++ b/release/wildfly-smpp-subsystem.txt
@@ -5,7 +5,7 @@
             <mbean name="SmppShellExecutor" type="SmppShellExecutor"/>
             <mbean name="ShellExecutor" type="ShellExecutor">
                 <property name="address" type="String" value="127.0.0.1"/>
-                <property name="port" type="int" value="3435"/>
+                <property name="port" type="int" value="3436"/>
                 <property name="securityDomain" type="String" value="jmx-console"/>
             </mbean>
         </subsystem>