Revision: ad3d3213173e
Author: Sergey Vetyutnev <[email protected]>
Date: Wed Sep 25 06:03:19 2013 UTC
Log: Fixing compilation bugs
http://code.google.com/p/smscgateway/source/detail?r=ad3d3213173e
Modified:
/core/slee/services/alertsbb/src/main/java/org/mobicents/smsc/slee/services/alert/AlertSbb.java
/core/slee/services/alertsbb/src/main/resources/META-INF/sbb-jar.xml
/core/slee/services/mosbb/src/main/java/org/mobicents/smsc/slee/services/mo/MoCommonSbb.java
/core/slee/services/mosbb/src/main/resources/META-INF/sbb-jar.xml
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtCommonSbb.java
/core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml
/test/mapmodule/src/main/java/org/mobicents/smsc/ihub/MAPListener.java
=======================================
---
/core/slee/services/alertsbb/src/main/java/org/mobicents/smsc/slee/services/alert/AlertSbb.java
Tue May 8 15:35:43 2012 UTC
+++
/core/slee/services/alertsbb/src/main/java/org/mobicents/smsc/slee/services/alert/AlertSbb.java
Wed Sep 25 06:03:19 2013 UTC
@@ -31,7 +31,6 @@
import org.mobicents.slee.resource.map.events.DialogUserAbort;
import org.mobicents.slee.resource.map.events.ErrorComponent;
import org.mobicents.slee.resource.map.events.InvokeTimeout;
-import org.mobicents.slee.resource.map.events.ProviderErrorComponent;
import org.mobicents.slee.resource.map.events.RejectComponent;
public abstract class AlertSbb implements Sbb {
@@ -65,9 +64,9 @@
}
}
- public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
- this.logger.severe("Rx : onProviderErrorComponent" + event);
- }
+// public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
+// this.logger.severe("Rx : onProviderErrorComponent" + event);
+// }
public void onRejectComponent(RejectComponent event,
ActivityContextInterface aci) {
this.logger.severe("Rx : onRejectComponent" + event);
=======================================
--- /core/slee/services/alertsbb/src/main/resources/META-INF/sbb-jar.xml
Tue May 8 15:35:43 2012 UTC
+++ /core/slee/services/alertsbb/src/main/resources/META-INF/sbb-jar.xml
Wed Sep 25 06:03:19 2013 UTC
@@ -138,15 +138,6 @@
</event-type-ref>
</event>
- <event event-direction="Receive" initial-event="False">
- <event-name>ProviderErrorComponent</event-name>
- <event-type-ref>
-
<event-type-name>ss7.map.PROVIDER_ERROR_COMPONENT</event-type-name>
-
<event-type-vendor>org.mobicents</event-type-vendor>
- <event-type-version>1.0</event-type-version>
- </event-type-ref>
- </event>
-
<event event-direction="Receive" initial-event="False">
<event-name>RejectComponent</event-name>
<event-type-ref>
=======================================
---
/core/slee/services/mosbb/src/main/java/org/mobicents/smsc/slee/services/mo/MoCommonSbb.java
Thu Jul 12 13:56:54 2012 UTC
+++
/core/slee/services/mosbb/src/main/java/org/mobicents/smsc/slee/services/mo/MoCommonSbb.java
Wed Sep 25 06:03:19 2013 UTC
@@ -25,7 +25,6 @@
import org.mobicents.slee.resource.map.events.DialogUserAbort;
import org.mobicents.slee.resource.map.events.ErrorComponent;
import org.mobicents.slee.resource.map.events.InvokeTimeout;
-import org.mobicents.slee.resource.map.events.ProviderErrorComponent;
import org.mobicents.slee.resource.map.events.RejectComponent;
import org.mobicents.smsc.slee.resources.smpp.server.SmppServerSessions;
@@ -62,9 +61,9 @@
}
}
- public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
- this.logger.severe("Rx : onProviderErrorComponent" + event);
- }
+// public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
+// this.logger.severe("Rx : onProviderErrorComponent" + event);
+// }
public void onRejectComponent(RejectComponent event,
ActivityContextInterface aci) {
this.logger.severe("Rx : onRejectComponent" + event);
=======================================
--- /core/slee/services/mosbb/src/main/resources/META-INF/sbb-jar.xml Thu
Jul 12 13:56:54 2012 UTC
+++ /core/slee/services/mosbb/src/main/resources/META-INF/sbb-jar.xml Wed
Sep 25 06:03:19 2013 UTC
@@ -187,15 +187,6 @@
</event-type-ref>
</event>
- <event event-direction="Receive" initial-event="False">
- <event-name>ProviderErrorComponent</event-name>
- <event-type-ref>
-
<event-type-name>ss7.map.PROVIDER_ERROR_COMPONENT</event-type-name>
-
<event-type-vendor>org.mobicents</event-type-vendor>
- <event-type-version>1.0</event-type-version>
- </event-type-ref>
- </event>
-
<event event-direction="Receive" initial-event="False">
<event-name>RejectComponent</event-name>
<event-type-ref>
=======================================
---
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtCommonSbb.java
Thu Aug 16 13:23:01 2012 UTC
+++
/core/slee/services/mtsbb/src/main/java/org/mobicents/smsc/slee/services/mt/MtCommonSbb.java
Wed Sep 25 06:03:19 2013 UTC
@@ -59,7 +59,6 @@
import org.mobicents.slee.resource.map.events.DialogUserAbort;
import org.mobicents.slee.resource.map.events.ErrorComponent;
import org.mobicents.slee.resource.map.events.InvokeTimeout;
-import org.mobicents.slee.resource.map.events.ProviderErrorComponent;
import org.mobicents.slee.resource.map.events.RejectComponent;
import org.mobicents.smsc.slee.services.smpp.server.events.SmsEvent;
import org.mobicents.smsc.smpp.SmscPropertiesManagement;
@@ -138,17 +137,17 @@
}
}
- public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
- this.logger.severe("Rx : onProviderErrorComponent" + event);
-
- SmsEvent original = this.getOriginalSmsEvent();
-
- if (original != null) {
- if (original.getSystemId() != null) {
- this.sendFailureDeliverSmToEsms(original);
- }
- }
- }
+// public void onProviderErrorComponent(ProviderErrorComponent event,
ActivityContextInterface aci) {
+// this.logger.severe("Rx : onProviderErrorComponent" + event);
+//
+// SmsEvent original = this.getOriginalSmsEvent();
+//
+// if (original != null) {
+// if (original.getSystemId() != null) {
+// this.sendFailureDeliverSmToEsms(original);
+// }
+// }
+// }
public void onRejectComponent(RejectComponent event,
ActivityContextInterface aci) {
this.logger.severe("Rx : onRejectComponent" + event);
=======================================
--- /core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml Thu
Aug 16 14:14:36 2012 UTC
+++ /core/slee/services/mtsbb/src/main/resources/META-INF/sbb-jar.xml Wed
Sep 25 06:03:19 2013 UTC
@@ -186,15 +186,6 @@
</event-type-ref>
</event>
- <event event-direction="Receive" initial-event="False">
- <event-name>ProviderErrorComponent</event-name>
- <event-type-ref>
-
<event-type-name>ss7.map.PROVIDER_ERROR_COMPONENT</event-type-name>
-
<event-type-vendor>org.mobicents</event-type-vendor>
- <event-type-version>1.0</event-type-version>
- </event-type-ref>
- </event>
-
<event event-direction="Receive" initial-event="False">
<event-name>RejectComponent</event-name>
<event-type-ref>
=======================================
--- /test/mapmodule/src/main/java/org/mobicents/smsc/ihub/MAPListener.java
Thu Aug 16 14:14:36 2012 UTC
+++ /test/mapmodule/src/main/java/org/mobicents/smsc/ihub/MAPListener.java
Wed Sep 25 06:03:19 2013 UTC
@@ -10,10 +10,11 @@
import org.mobicents.protocols.ss7.map.api.dialog.MAPAbortProviderReason;
import org.mobicents.protocols.ss7.map.api.dialog.MAPAbortSource;
import
org.mobicents.protocols.ss7.map.api.dialog.MAPNoticeProblemDiagnostic;
-import org.mobicents.protocols.ss7.map.api.dialog.MAPProviderError;
import org.mobicents.protocols.ss7.map.api.dialog.MAPRefuseReason;
import org.mobicents.protocols.ss7.map.api.dialog.MAPUserAbortChoice;
+import
org.mobicents.protocols.ss7.map.api.errors.AbsentSubscriberDiagnosticSM;
import org.mobicents.protocols.ss7.map.api.errors.MAPErrorMessage;
+import
org.mobicents.protocols.ss7.map.api.errors.MAPErrorMessageAbsentSubscriberSM;
import org.mobicents.protocols.ss7.map.api.errors.MAPErrorMessageFactory;
import org.mobicents.protocols.ss7.map.api.primitives.AddressNature;
import org.mobicents.protocols.ss7.map.api.primitives.AddressString;
@@ -98,13 +99,6 @@
// TODO Auto-generated method stub
}
-
- @Override
- public void onDialogReject(MAPDialog arg0, MAPRefuseReason arg1,
MAPProviderError arg2,
- ApplicationContextName arg3, MAPExtensionContainer
arg4) {
- // TODO Auto-generated method stub
-
- }
@Override
public void onDialogRelease(MAPDialog arg0) {
@@ -158,18 +152,6 @@
// TODO Auto-generated method stub
}
-
- @Override
- public void onProviderErrorComponent(MAPDialog arg0, Long arg1,
MAPProviderError arg2) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void onRejectComponent(MAPDialog arg0, Long arg1, Problem arg2) {
- // TODO Auto-generated method stub
-
- }
/**
* SMS Listener
@@ -199,7 +181,11 @@
if (this.currentMapMessageCount % 7 == 0) {
// Send back AbsentSubscriber for every 7th MtSMS
try {
- MAPErrorMessage mapErrorMessage =
mAPErrorMessageFactory.createMAPErrorMessageAbsentSubscriberSM(1,
+// MAPErrorMessageAbsentSubscriberSM
createMAPErrorMessageAbsentSubscriberSM(
+// AbsentSubscriberDiagnosticSM
absentSubscriberDiagnosticSM, MAPExtensionContainer extensionContainer,
+// AbsentSubscriberDiagnosticSM
additionalAbsentSubscriberDiagnosticSM);
+
+ MAPErrorMessage mapErrorMessage =
mAPErrorMessageFactory.createMAPErrorMessageAbsentSubscriberSM(AbsentSubscriberDiagnosticSM.IMSIDetached,
null, null);
mapDialogSms.sendErrorComponent(event.getInvokeId(), mapErrorMessage);
mapDialogSms.close(false);
@@ -286,7 +272,7 @@
if (this.currentMapMessageCount % 7 == 0) {
// Send back AbsentSubscriber for every 7th MtSMS
try {
- MAPErrorMessage mapErrorMessage =
mAPErrorMessageFactory.createMAPErrorMessageAbsentSubscriberSM(1,
+ MAPErrorMessage mapErrorMessage =
mAPErrorMessageFactory.createMAPErrorMessageAbsentSubscriberSM(AbsentSubscriberDiagnosticSM.IMSIDetached,
null, null);
mapDialogSms.sendErrorComponent(event.getInvokeId(), mapErrorMessage);
mapDialogSms.close(false);
@@ -338,7 +324,10 @@
MAPDialogSms mapDialogSms = event.getMAPDialog();
try {
- mapDialogSms.addSendRoutingInfoForSMResponse(event.getInvokeId(), imsi,
li, null);
+// void addSendRoutingInfoForSMResponse(long invokeId, IMSI imsi,
LocationInfoWithLMSI locationInfoWithLMSI,
+// MAPExtensionContainer extensionContainer, Boolean mwdSet)
throws MAPException;
+
+ mapDialogSms.addSendRoutingInfoForSMResponse(event.getInvokeId(), imsi,
li, null, null);
mapDialogSms.close(false);
} catch (MAPException e) {
e.printStackTrace();
@@ -350,4 +339,17 @@
// TODO Auto-generated method stub
}
+
+ @Override
+ public void onRejectComponent(MAPDialog mapDialog, Long invokeId,
Problem problem, boolean isLocalOriginated) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason
refuseReason, ApplicationContextName alternativeApplicationContext,
+ MAPExtensionContainer extensionContainer) {
+ // TODO Auto-generated method stub
+
+ }
}
--
---
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.