From e51f03300d2ba7e207040cfab13935320ad33c8c Mon Sep 17 00:00:00 2001 From: Anatoly Satanovskiy Date: Fri, 3 Nov 2017 12:38:59 +0200 Subject: [PATCH] smsc wildfly compatibility changes Conflicts: service/wildfly/modules/pom.xml service/wildfly/modules/src/main/module/module.xml --- release/build.xml | 7 +- release/release-build-wildfly.xml | 18 +++- .../mobicents/ss7/extension/SubsystemAdd.java | 3 +- .../ss7/service/SS7ExtensionService.java | 75 ++++++++++++----- .../ss7/service/SS7ServiceInterface.java | 16 ++++ .../extension/src/main/module/module.xml | 3 +- service/wildfly/modules/pom.xml | 58 ++++++------- .../modules/src/main/module/module.xml | 11 +-- service/wildfly/pom.xml | 1 + .../restcomm-ss7-wildfly-commons/pom.xml | 83 +++++++++++++++++++ .../src/main/assemble/descriptor.xml | 28 +++++++ .../src/main/module/module.xml | 34 ++++++++ 12 files changed, 275 insertions(+), 62 deletions(-) create mode 100644 service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ServiceInterface.java create mode 100644 service/wildfly/restcomm-ss7-wildfly-commons/pom.xml create mode 100644 service/wildfly/restcomm-ss7-wildfly-commons/src/main/assemble/descriptor.xml create mode 100644 service/wildfly/restcomm-ss7-wildfly-commons/src/main/module/module.xml diff --git a/release/build.xml b/release/build.xml index 5e19ccf62f..2f0facc05b 100644 --- a/release/build.xml +++ b/release/build.xml @@ -236,7 +236,12 @@ - + + + + + + Copy OAM ui diff --git a/release/release-build-wildfly.xml b/release/release-build-wildfly.xml index b734ef54a6..9d1888418b 100644 --- a/release/release-build-wildfly.xml +++ b/release/release-build-wildfly.xml @@ -60,7 +60,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -154,5 +154,17 @@ - + + + + + + + + + + + + + diff --git a/service/wildfly/extension/src/main/java/org/mobicents/ss7/extension/SubsystemAdd.java b/service/wildfly/extension/src/main/java/org/mobicents/ss7/extension/SubsystemAdd.java index 4715a083d5..50cdce68a4 100644 --- a/service/wildfly/extension/src/main/java/org/mobicents/ss7/extension/SubsystemAdd.java +++ b/service/wildfly/extension/src/main/java/org/mobicents/ss7/extension/SubsystemAdd.java @@ -14,6 +14,7 @@ import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.mobicents.ss7.service.SS7ExtensionService; +import org.mobicents.ss7.service.SS7ServiceInterface; 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 = SS7ExtensionService.getServiceName(); - ServiceController controller = context.getServiceTarget() + ServiceController 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/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ExtensionService.java b/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ExtensionService.java index 53c1b7b22a..447bda1753 100644 --- a/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ExtensionService.java +++ b/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ExtensionService.java @@ -81,7 +81,7 @@ * @author sergey vetyutnev * */ -public class SS7ExtensionService implements Service { +public class SS7ExtensionService implements SS7ServiceInterface,Service { // // public static final SS7ExtensionService INSTANCE = new SS7ExtensionService(); @@ -216,25 +216,27 @@ public void start(StartContext context) throws StartException { } createPayloadParts(dataDir); - - shellExecutorMBean = null; - try { - FastList shellExecutors = new FastList(); - shellExecutors.add(beanSccpExecutor); - shellExecutors.add(beanM3uaShellExecutor); - shellExecutors.add(beanSctpShellExecutor); - shellExecutors.add(beanTcapExecutor); - - String address = getPropertyString("ShellExecutor", "address", "127.0.0.1"); - int port = getPropertyInt("ShellExecutor", "port", 3435); - 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); + System.out.println("SS7 shellExecutorExists():" + shellExecutorExists()); + if(shellExecutorExists()) { + shellExecutorMBean = null; + try { + FastList shellExecutors = new FastList(); + shellExecutors.add(beanSccpExecutor); + shellExecutors.add(beanM3uaShellExecutor); + shellExecutors.add(beanSctpShellExecutor); + shellExecutors.add(beanTcapExecutor); + + String address = getPropertyString("ShellExecutor", "address", "127.0.0.1"); + int port = getPropertyInt("ShellExecutor", "port", 3435); + 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); + } } // Ss7Management @@ -406,7 +408,9 @@ public void start(StartContext context) throws StartException { // Starting of general beans try { - shellExecutorMBean.start(); + if(shellExecutorMBean != null) { + shellExecutorMBean.start(); + } ss7ManagementMBean.start(); restcommAlarmManagementMBean.start(); restcommStatisticManagementMBean.start(); @@ -475,6 +479,11 @@ public void start(StartContext context) throws StartException { } } + private boolean shellExecutorExists() { + ModelNode shellExecutorNode = peek(fullModel, "mbean", "ShellExecutor"); + return shellExecutorNode != null; + } + @Override public void stop(StopContext context) { log.info("Stopping SS7ExtensionService"); @@ -1273,4 +1282,28 @@ private void createCapService(ModelNode serviceNode, String beanName, String dat } } + @Override + public ShellExecutor getBeanSctpShellExecutor() { + return beanSctpShellExecutor; + } + + @Override + public ShellExecutor getBeanM3uaShellExecutor() { + return beanM3uaShellExecutor; + } + + @Override + public ShellExecutor getBeanSccpExecutor() { + return beanSccpExecutor; + } + + @Override + public ShellExecutor getBeanTcapExecutor() { + return beanTcapExecutor; + } + + @Override + public Ss7Management getSs7Management() { + return ss7ManagementMBean; + } } diff --git a/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ServiceInterface.java b/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ServiceInterface.java new file mode 100644 index 0000000000..42ef9bc979 --- /dev/null +++ b/service/wildfly/extension/src/main/java/org/mobicents/ss7/service/SS7ServiceInterface.java @@ -0,0 +1,16 @@ +package org.mobicents.ss7.service; + +import org.mobicents.protocols.ss7.oam.common.jmxss7.Ss7Management; +import org.mobicents.ss7.management.console.ShellExecutor; + +public interface SS7ServiceInterface { + ShellExecutor getBeanSctpShellExecutor(); + + ShellExecutor getBeanM3uaShellExecutor(); + + ShellExecutor getBeanSccpExecutor(); + + ShellExecutor getBeanTcapExecutor(); + + Ss7Management getSs7Management(); +} \ No newline at end of file diff --git a/service/wildfly/extension/src/main/module/module.xml b/service/wildfly/extension/src/main/module/module.xml index ab9106582b..3c34eb556b 100644 --- a/service/wildfly/extension/src/main/module/module.xml +++ b/service/wildfly/extension/src/main/module/module.xml @@ -19,5 +19,6 @@ + - + \ No newline at end of file diff --git a/service/wildfly/modules/pom.xml b/service/wildfly/modules/pom.xml index 216e61ae9b..c4114453ad 100644 --- a/service/wildfly/modules/pom.xml +++ b/service/wildfly/modules/pom.xml @@ -19,6 +19,34 @@ + + maven-compiler-plugin + 2.3.1 + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.8.1 + + true + true + -Xmx512m + + + jboss.home + ${jboss.home} + + + + **/*TestCase.java + + once + + org.apache.maven.plugins maven-assembly-plugin @@ -47,16 +75,13 @@ - - javolution - javolution - ${javolution.version} - + org.mobicents.protocols.stream stream @@ -74,13 +99,6 @@ congestion ${project.version} - - - org.mobicents.protocols.ss7.scheduler - scheduler - ${project.version} - - @@ -89,12 +107,6 @@ ${project.version} - - - org.mobicents.protocols.ss7.management - shell-transport - ${project.version} - - - org.mobicents.protocols.ss7.management - shell-server-api - ${project.version} - - - org.mobicents.protocols.ss7.management - shell-server-impl - ${project.version} - diff --git a/service/wildfly/modules/src/main/module/module.xml b/service/wildfly/modules/src/main/module/module.xml index d65fa3cc19..97c5d88eca 100644 --- a/service/wildfly/modules/src/main/module/module.xml +++ b/service/wildfly/modules/src/main/module/module.xml @@ -2,13 +2,13 @@ - + - @@ -38,9 +38,6 @@ - - - @@ -76,7 +73,7 @@ - + - \ No newline at end of file + diff --git a/service/wildfly/pom.xml b/service/wildfly/pom.xml index 105e661253..d20136f510 100644 --- a/service/wildfly/pom.xml +++ b/service/wildfly/pom.xml @@ -22,6 +22,7 @@ modules extension + restcomm-ss7-wildfly-commons diff --git a/service/wildfly/restcomm-ss7-wildfly-commons/pom.xml b/service/wildfly/restcomm-ss7-wildfly-commons/pom.xml new file mode 100644 index 0000000000..e6ac3d597b --- /dev/null +++ b/service/wildfly/restcomm-ss7-wildfly-commons/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + + + org.mobicents.protocols.ss7 + restcomm-ss7-wildfly + 7.4.0-SNAPSHOT + + + restcomm-ss7-wildfly-commons + + Restcomm jSS7 :: Service :: Commons :: ${project.artifactId} + + + org.mobicents.ss7.commons + org/mobicents/ss7/commons + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + + src/main/assemble/descriptor.xml + + + false + module + + + + make-assembly + package + + single + + + + + + + + + + + javolution + javolution + ${javolution.version} + + + + org.mobicents.protocols.ss7.management + shell-server-api + ${project.version} + + + org.mobicents.protocols.ss7.management + shell-server-impl + ${project.version} + + + + + org.mobicents.protocols.ss7.management + shell-transport + ${project.version} + + + + + org.mobicents.protocols.ss7.scheduler + scheduler + ${project.version} + + + + + \ No newline at end of file diff --git a/service/wildfly/restcomm-ss7-wildfly-commons/src/main/assemble/descriptor.xml b/service/wildfly/restcomm-ss7-wildfly-commons/src/main/assemble/descriptor.xml new file mode 100644 index 0000000000..a917b19fbc --- /dev/null +++ b/service/wildfly/restcomm-ss7-wildfly-commons/src/main/assemble/descriptor.xml @@ -0,0 +1,28 @@ + + + commons + + + dir + + + main + + + + src/main/module + / + true + + + + + + / + false + false + compile + + + + \ No newline at end of file diff --git a/service/wildfly/restcomm-ss7-wildfly-commons/src/main/module/module.xml b/service/wildfly/restcomm-ss7-wildfly-commons/src/main/module/module.xml new file mode 100644 index 0000000000..37c87bce60 --- /dev/null +++ b/service/wildfly/restcomm-ss7-wildfly-commons/src/main/module/module.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file