Revision: 5450f0031bf4
Author:   Sergey Vetyutnev <[email protected]>
Date:     Fri Sep 20 17:47:37 2013 UTC
Log:      Adding "name" property into TCAP, TCAP-ANSI, MAP, CAP stacks
http://code.google.com/p/jss7/source/detail?r=5450f0031bf4

Modified:
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPStack.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPStackImpl.java /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPProviderImplWrapper.java /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPStackImplWrapper.java
 /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java
 /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java
/map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java /map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/MAPStack.java /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPProviderImpl.java /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPStackImpl.java /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPProviderImplWrapper.java /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPStackImplWrapper.java
 /sccp/.gitignore
/tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/TCAPStack.java /tcap-ansi/tcap-ansi-impl/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImpl.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/DialogIdRangeTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPAbnormalTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPComponentsTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPFunctionalTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImplWrapper.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStatTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleEndTest.java /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleTest.java /tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/TCAPStack.java /tcap/tcap-impl/src/main/java/org/mobicents/protocols/ss7/tcap/TCAPStackImpl.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/DialogIdRangeTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPAbnormalTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPComponentsTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPFunctionalTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStackImplWrapper.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStatTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleEndTest.java /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleTest.java

=======================================
--- /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPStack.java Wed Jun 26 08:00:08 2013 UTC +++ /cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPStack.java Fri Sep 20 17:47:37 2013 UTC
@@ -31,6 +31,13 @@
  */
 public interface CAPStack {

+    /**
+     * Returns the name of this stack
+     *
+     * @return
+     */
+    String getName();
+
     CAPProvider getCAPProvider();

     void stop();
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java Mon May 20 20:09:00 2013 UTC +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPProviderImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -117,7 +117,7 @@
  */
 public class CAPProviderImpl implements CAPProvider, TCListener {

- protected static final Logger loger = Logger.getLogger(CAPProviderImpl.class);
+    protected final Logger loger;

private transient List<CAPDialogListener> dialogListeners = new CopyOnWriteArrayList<CAPDialogListener>();

@@ -137,9 +137,11 @@
private final transient CAPServiceGprs capServiceGprs = new CAPServiceGprsImpl(this); private final transient CAPServiceSms capServiceSms = new CAPServiceSmsImpl(this);

-    public CAPProviderImpl(TCAPProvider tcapProvider) {
+    public CAPProviderImpl(String name, TCAPProvider tcapProvider) {
         this.tcapProvider = tcapProvider;

+ this.loger = Logger.getLogger(CAPStackImpl.class.getCanonicalName() + "-" + name);
+
         this.capServices.add(this.capServiceCircuitSwitchedCall);
         this.capServices.add(this.capServiceGprs);
         this.capServices.add(this.capServiceSms);
=======================================
--- /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPStackImpl.java Wed Jun 26 08:00:08 2013 UTC +++ /cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/CAPStackImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -42,19 +42,27 @@

     private State state = State.IDLE;

-    public CAPStackImpl(SccpProvider sccpPprovider, int ssn) {
-        this.tcapStack = new TCAPStackImpl(sccpPprovider, ssn);
+    private final String name;
+
+    public CAPStackImpl(String name, SccpProvider sccpPprovider, int ssn) {
+        this.name = name;
+        this.tcapStack = new TCAPStackImpl(name, sccpPprovider, ssn);
         TCAPProvider tcapProvider = tcapStack.getProvider();
-        capProvider = new CAPProviderImpl(tcapProvider);
+        capProvider = new CAPProviderImpl(name, tcapProvider);

         this.state = State.CONFIGURED;
     }

-    public CAPStackImpl(TCAPProvider tcapProvider) {
-
-        capProvider = new CAPProviderImpl(tcapProvider);
+    public CAPStackImpl(String name, TCAPProvider tcapProvider) {
+        this.name = name;
+        capProvider = new CAPProviderImpl(name, tcapProvider);
         this.state = State.CONFIGURED;
     }
+
+    @Override
+    public String getName() {
+        return name;
+    }

     @Override
     public CAPProvider getCAPProvider() {
=======================================
--- /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPProviderImplWrapper.java Mon May 20 20:09:00 2013 UTC +++ /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPProviderImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -47,7 +47,7 @@
// private final MAPServiceSupplementary mapServiceSupplementaryTest = new MAPServiceSupplementaryImplWrapper(this);

     public CAPProviderImplWrapper(TCAPProvider tcapProvider) {
-        super(tcapProvider);
+        super("Test", tcapProvider);

         for (CAPServiceBase serv : this.capServices) {
             if (serv instanceof MAPServiceSupplementary) {
=======================================
--- /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPStackImplWrapper.java Mon May 20 20:09:00 2013 UTC +++ /cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/functional/CAPStackImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -28,7 +28,7 @@
 public class CAPStackImplWrapper extends CAPStackImpl {

     public CAPStackImplWrapper(SccpProvider sccpPprovider, int ssn) {
-        super(sccpPprovider, ssn);
+        super("Test", sccpPprovider, ssn);
this.capProvider = new CAPProviderImplWrapper(this.tcapStack.getProvider());
     }
 }
=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java Wed Jul 24 17:54:57 2013 UTC +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java Fri Sep 20 17:47:37 2013 UTC
@@ -172,7 +172,7 @@
     }

     private void initTCAP() throws Exception {
- this.tcapStack = new TCAPStackImpl(this.sccpStack.getSccpProvider(), SSN); + this.tcapStack = new TCAPStackImpl("Test", this.sccpStack.getSccpProvider(), SSN);
         this.tcapStack.setDialogIdleTimeout(60000);
         this.tcapStack.setInvokeTimeout(30000);
         this.tcapStack.setMaxDialogs(2000);
@@ -184,7 +184,7 @@
         System.out.println("initMAP");

// this.mapStack = new MAPStackImpl(this.sccpStack.getSccpProvider(), SSN);
-        this.mapStack = new MAPStackImpl(this.tcapStack.getProvider());
+ this.mapStack = new MAPStackImpl("Test", this.tcapStack.getProvider());
         this.mapProvider = this.mapStack.getMAPProvider();

         System.out.println("this.mapProvider = " + this.mapProvider);
=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java Wed Jun 26 08:00:08 2013 UTC +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java Fri Sep 20 17:47:37 2013 UTC
@@ -159,7 +159,7 @@
     }

     private void initMAP() throws Exception {
- this.mapStack = new MAPStackImpl(this.sccpStack.getSccpProvider(), SSN); + this.mapStack = new MAPStackImpl("Test", this.sccpStack.getSccpProvider(), SSN);
         this.mapProvider = this.mapStack.getMAPProvider();

         this.mapProvider.addMAPDialogListener(this);
=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java Wed Jun 26 08:00:08 2013 UTC +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java Fri Sep 20 17:47:37 2013 UTC
@@ -149,7 +149,7 @@

         System.out.println("initMAP");

- this.mapStack = new MAPStackImpl(this.sccpStack.getSccpProvider(), SSN); + this.mapStack = new MAPStackImpl("Test", this.sccpStack.getSccpProvider(), SSN);
         this.mapProvider = this.mapStack.getMAPProvider();

         System.out.println("this.mapProvider = " + this.mapProvider);
=======================================
--- /map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/MAPStack.java Wed Jun 26 08:00:08 2013 UTC +++ /map/map-api/src/main/java/org/mobicents/protocols/ss7/map/api/MAPStack.java Fri Sep 20 17:47:37 2013 UTC
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -31,6 +31,13 @@
  */
 public interface MAPStack {

+    /**
+     * Returns the name of this stack
+     *
+     * @return
+     */
+    String getName();
+
     MAPProvider getMAPProvider();

     void stop();
=======================================
--- /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPProviderImpl.java Mon May 20 20:09:00 2013 UTC +++ /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPProviderImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -135,7 +135,7 @@
  */
 public class MAPProviderImpl implements MAPProvider, TCListener {

- protected static final Logger loger = Logger.getLogger(MAPProviderImpl.class);
+    protected final Logger loger;

private transient List<MAPDialogListener> dialogListeners = new CopyOnWriteArrayList<MAPDialogListener>();

@@ -166,9 +166,11 @@
      * public common methods
      */

-    public MAPProviderImpl(TCAPProvider tcapProvider) {
+    public MAPProviderImpl(String name, TCAPProvider tcapProvider) {
         this.tcapProvider = tcapProvider;

+ this.loger = Logger.getLogger(MAPStackImpl.class.getCanonicalName() + "-" + name);
+
         this.mapServices.add(this.mapServiceMobility);
         this.mapServices.add(this.mapServiceCallHandling);
         this.mapServices.add(this.mapServiceOam);
=======================================
--- /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPStackImpl.java Wed Jun 26 08:00:08 2013 UTC +++ /map/map-impl/src/main/java/org/mobicents/protocols/ss7/map/MAPStackImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -1,6 +1,6 @@
 /*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications  Copyright 2012.
+ * and individual contributors
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -43,19 +43,27 @@

     private State state = State.IDLE;

-    public MAPStackImpl(SccpProvider sccpPprovider, int ssn) {
-        this.tcapStack = new TCAPStackImpl(sccpPprovider, ssn);
+    private final String name;
+
+    public MAPStackImpl(String name, SccpProvider sccpPprovider, int ssn) {
+        this.name = name;
+        this.tcapStack = new TCAPStackImpl(name, sccpPprovider, ssn);
         TCAPProvider tcapProvider = tcapStack.getProvider();
-        mapProvider = new MAPProviderImpl(tcapProvider);
+        mapProvider = new MAPProviderImpl(name, tcapProvider);

         this.state = State.CONFIGURED;
     }

-    public MAPStackImpl(TCAPProvider tcapProvider) {
-
-        mapProvider = new MAPProviderImpl(tcapProvider);
+    public MAPStackImpl(String name, TCAPProvider tcapProvider) {
+        this.name = name;
+        mapProvider = new MAPProviderImpl(name, tcapProvider);
         this.state = State.CONFIGURED;
     }
+
+    @Override
+    public String getName() {
+        return name;
+    }

     public MAPProvider getMAPProvider() {
         return this.mapProvider;
=======================================
--- /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPProviderImplWrapper.java Mon May 20 20:09:00 2013 UTC +++ /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPProviderImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -46,7 +46,7 @@
private final MAPServiceSupplementary mapServiceSupplementaryTest = new MAPServiceSupplementaryImplWrapper(this);

     public MAPProviderImplWrapper(TCAPProvider tcapProvider) {
-        super(tcapProvider);
+        super("Test", tcapProvider);

         for (MAPServiceBase serv : this.mapServices) {
             if (serv instanceof MAPServiceSupplementary) {
=======================================
--- /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPStackImplWrapper.java Mon May 20 20:09:00 2013 UTC +++ /map/map-impl/src/test/java/org/mobicents/protocols/ss7/map/functional/MAPStackImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -28,7 +28,7 @@
 public class MAPStackImplWrapper extends MAPStackImpl {

     public MAPStackImplWrapper(SccpProvider sccpPprovider, int ssn) {
-        super(sccpPprovider, ssn);
+        super("Test", sccpPprovider, ssn);
this.mapProvider = new MAPProviderImplWrapper(this.tcapStack.getProvider());
     }

=======================================
--- /sccp/.gitignore    Sun Jun 23 20:22:48 2013 UTC
+++ /sccp/.gitignore    Fri Sep 20 17:47:37 2013 UTC
@@ -17,3 +17,5 @@
 /.gitignore
 /TestStack_sccpresource2.xml
 /TestStack_sccprouter2.xml
+/sspTestSccpStack2_management2.xml
+/sspTestSccpStack1_management2.xml
=======================================
--- /tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/TCAPStack.java Mon Aug 19 12:04:16 2013 UTC +++ /tcap-ansi/tcap-ansi-api/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/api/TCAPStack.java Fri Sep 20 17:47:37 2013 UTC
@@ -28,6 +28,13 @@
  */
 public interface TCAPStack {

+    /**
+     * Returns the name of this stack
+     *
+     * @return
+     */
+    String getName();
+
     /**
      * Returns stack provider.
      *
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImpl.java Mon Aug 19 12:04:16 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/main/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -36,7 +36,7 @@
  */
 public class TCAPStackImpl implements TCAPStack {

- private static final Logger logger = Logger.getLogger(TCAPStackImpl.class);
+    private final Logger logger;

     // default value of idle timeout and after TC_END remove of task.
     public static final long _DIALOG_TIMEOUT = 60000;
@@ -49,6 +49,8 @@
     private SccpProvider sccpProvider;
     private SccpAddress address;

+    private final String name;
+
     private volatile boolean started = false;

     private long dialogTimeout = _DIALOG_TIMEOUT;
@@ -62,15 +64,25 @@
     private boolean previewMode = false;
     private boolean statisticsEnabled = false;

-    public TCAPStackImpl() {
+    public TCAPStackImpl(String name) {
         super();
+        this.name = name;

+ this.logger = Logger.getLogger(TCAPStackImpl.class.getCanonicalName() + "-" + this.name);
     }

-    public TCAPStackImpl(SccpProvider sccpProvider, int ssn) {
+    public TCAPStackImpl(String name, SccpProvider sccpProvider, int ssn) {
+        this.name = name;
         this.sccpProvider = sccpProvider;
         this.tcapProvider = new TCAPProviderImpl(sccpProvider, this, ssn);
this.tcapCounterProvider = new TCAPCounterProviderImpl(this.tcapProvider);
+
+ this.logger = Logger.getLogger(TCAPStackImpl.class.getCanonicalName() + "-" + this.name);
+    }
+
+    @Override
+    public String getName() {
+        return name;
     }

     public void start() throws Exception {
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/DialogIdRangeTest.java Mon Jul 15 13:53:19 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/DialogIdRangeTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -64,7 +64,7 @@
     public void setUp() throws Exception {
         super.setUp();

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);

         this.tcapStack1.start();
     }
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPAbnormalTest.java Mon Aug 5 18:53:50 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPAbnormalTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -96,8 +96,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPComponentsTest.java Fri Sep 13 15:38:35 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPComponentsTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -115,8 +115,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPFunctionalTest.java Mon Aug 5 18:53:50 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPFunctionalTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -96,8 +96,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapListenerWrapper = new TCAPListenerWrapper();
         this.tcapStack1.getProvider().addTCListener(tcapListenerWrapper);
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImplWrapper.java Sun Jul 7 15:39:29 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStackImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -37,7 +37,7 @@
 public class TCAPStackImplWrapper extends TCAPStackImpl {

     public TCAPStackImplWrapper(SccpProvider sccpProvider, int ssn) {
-        super();
+        super("Test");

this.tcapProvider = new TCAPProviderImplWrapper(sccpProvider, this, ssn);
     }
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStatTest.java Fri Sep 13 15:38:35 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/TCAPStatTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -108,8 +108,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapListenerWrapper = new TCAPListenerWrapper();
         this.tcapStack1.getProvider().addTCListener(tcapListenerWrapper);
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleEndTest.java Mon Aug 5 18:53:50 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleEndTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -94,8 +94,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleTest.java Mon Aug 5 18:53:50 2013 UTC +++ /tcap-ansi/tcap-ansi-impl/src/test/java/org/mobicents/protocols/ss7/tcapAnsi/dialog/timeout/DialogIdleTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -90,8 +90,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/TCAPStack.java Thu Aug 15 16:47:44 2013 UTC +++ /tcap/tcap-api/src/main/java/org/mobicents/protocols/ss7/tcap/api/TCAPStack.java Fri Sep 20 17:47:37 2013 UTC
@@ -28,6 +28,13 @@
  */
 public interface TCAPStack {

+    /**
+     * Returns the name of this stack
+     *
+     * @return
+     */
+    String getName();
+
     /**
      * Returns stack provider.
      *
=======================================
--- /tcap/tcap-impl/src/main/java/org/mobicents/protocols/ss7/tcap/TCAPStackImpl.java Thu Aug 15 16:47:44 2013 UTC +++ /tcap/tcap-impl/src/main/java/org/mobicents/protocols/ss7/tcap/TCAPStackImpl.java Fri Sep 20 17:47:37 2013 UTC
@@ -36,7 +36,7 @@
  */
 public class TCAPStackImpl implements TCAPStack {

- private static final Logger logger = Logger.getLogger(TCAPStackImpl.class);
+    private final Logger logger;

     // default value of idle timeout and after TC_END remove of task.
     public static final long _DIALOG_TIMEOUT = 60000;
@@ -49,6 +49,8 @@
     private SccpProvider sccpProvider;
     private SccpAddress address;

+    private final String name;
+
     private volatile boolean started = false;

     private long dialogTimeout = _DIALOG_TIMEOUT;
@@ -63,15 +65,25 @@
     private boolean doNotSendProtocolVersion = false;
     private boolean statisticsEnabled = false;

-    public TCAPStackImpl() {
+    public TCAPStackImpl(String name) {
         super();
+        this.name = name;

+ this.logger = Logger.getLogger(TCAPStackImpl.class.getCanonicalName() + "-" + this.name);
     }

-    public TCAPStackImpl(SccpProvider sccpProvider, int ssn) {
+    public TCAPStackImpl(String name, SccpProvider sccpProvider, int ssn) {
+        this.name = name;
         this.sccpProvider = sccpProvider;
         this.tcapProvider = new TCAPProviderImpl(sccpProvider, this, ssn);
this.tcapCounterProvider = new TCAPCounterProviderImpl(this.tcapProvider);
+
+ this.logger = Logger.getLogger(TCAPStackImpl.class.getCanonicalName() + "-" + this.name);
+    }
+
+    @Override
+    public String getName() {
+        return name;
     }

     public void start() throws Exception {
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/DialogIdRangeTest.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/DialogIdRangeTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -64,7 +64,7 @@
     public void setUp() throws Exception {
         super.setUp();

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);

         this.tcapStack1.start();
     }
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPAbnormalTest.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPAbnormalTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -90,8 +90,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPComponentsTest.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPComponentsTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -116,8 +116,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPFunctionalTest.java Fri Jul 19 16:59:05 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPFunctionalTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -99,9 +99,9 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
         this.tcapStack1.setDoNotSendProtocolVersion(false);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);
         this.tcapStack2.setDoNotSendProtocolVersion(false);

         this.tcapListenerWrapper = new TCAPListenerWrapper();
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStackImplWrapper.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStackImplWrapper.java Fri Sep 20 17:47:37 2013 UTC
@@ -35,7 +35,7 @@
 public class TCAPStackImplWrapper extends TCAPStackImpl {

     public TCAPStackImplWrapper(SccpProvider sccpProvider, int ssn) {
-        super();
+        super("Test");

this.tcapProvider = new TCAPProviderImplWrapper(sccpProvider, this, ssn);
     }
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStatTest.java Fri Sep 13 15:38:35 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/TCAPStatTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -110,9 +110,9 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
         this.tcapStack1.setDoNotSendProtocolVersion(false);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);
         this.tcapStack2.setDoNotSendProtocolVersion(false);

         this.tcapListenerWrapper = new TCAPListenerWrapper();
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleEndTest.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleEndTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -96,8 +96,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);
=======================================
--- /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleTest.java Mon May 20 20:09:00 2013 UTC +++ /tcap/tcap-impl/src/test/java/org/mobicents/protocols/ss7/tcap/dialog/timeout/DialogIdleTest.java Fri Sep 20 17:47:37 2013 UTC
@@ -91,8 +91,8 @@
peer1Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 1, null, 8); peer2Address = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, 2, null, 8);

-        this.tcapStack1 = new TCAPStackImpl(this.sccpProvider1, 8);
-        this.tcapStack2 = new TCAPStackImpl(this.sccpProvider2, 8);
+        this.tcapStack1 = new TCAPStackImpl("Test", this.sccpProvider1, 8);
+        this.tcapStack2 = new TCAPStackImpl("Test", this.sccpProvider2, 8);

         this.tcapStack1.setInvokeTimeout(0);
         this.tcapStack2.setInvokeTimeout(0);

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to