Revision: 22772
Author: [email protected]
Date: Mon Jul 23 21:48:52 2012
Log: Made MAP RA compatible with latest MAP API changes.
http://code.google.com/p/mobicents/source/detail?r=22772
Modified:
/trunk/servers/jain-slee/resources/map/du/src/main/resources/META-INF/jboss-dependency.xml
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPDialogMobilityWrapper.java
=======================================
---
/trunk/servers/jain-slee/resources/map/du/src/main/resources/META-INF/jboss-dependency.xml
Wed Sep 28 04:29:32 2011
+++
/trunk/servers/jain-slee/resources/map/du/src/main/resources/META-INF/jboss-dependency.xml
Mon Jul 23 21:48:52 2012
@@ -1,3 +1,3 @@
<dependency xmlns="urn:jboss:dependency:1.0">
- <item whenRequired="Real" dependentState="Installed">SS7Service</item>
+ <item whenRequired="Real"
dependentState="Installed">MAPSS7Service</item>
</dependency>
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Mon Jul 23 21:48:52 2012
@@ -74,6 +74,8 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.MAPServiceMobilityListener;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.SendAuthenticationInfoRequest;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.SendAuthenticationInfoResponse;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.CheckImeiRequest;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.CheckImeiResponse;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.UpdateLocationRequest;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.UpdateLocationResponse;
import
org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.AnyTimeInterrogationRequest;
@@ -822,24 +824,6 @@
}
- // ///////////////
- // SERVICE : SUBSCRIBER INFORMATION
- // //////////////
- public void onAnyTimeInterrogationRequest(AnyTimeInterrogationRequest
anyTimeInterrogationRequest) {
- MAPDialogMobilityWrapper mapDialogMobilityWrapper =
(MAPDialogMobilityWrapper) anyTimeInterrogationRequest
- .getMAPDialog().getUserObject();
- AnyTimeInterrogationRequestWrapper event = new
AnyTimeInterrogationRequestWrapper(mapDialogMobilityWrapper,
- anyTimeInterrogationRequest);
- onEvent(event.getEventTypeName(), mapDialogMobilityWrapper,
event);
- }
-
- public void onAnyTimeInterrogationResponse(AnyTimeInterrogationResponse
anyTimeInterrogationResponse) {
- MAPDialogMobilityWrapper mapDialogMobilityWrapper =
(MAPDialogMobilityWrapper) anyTimeInterrogationResponse
- .getMAPDialog().getUserObject();
- AnyTimeInterrogationResponseWrapper event = new
AnyTimeInterrogationResponseWrapper(mapDialogMobilityWrapper,
- anyTimeInterrogationResponse);
- onEvent(event.getEventTypeName(), mapDialogMobilityWrapper,
event);
- }
// ////////////////
// SERVICE: SMS //
@@ -956,6 +940,17 @@
// ///////////////
// SERVICE : MOBILITY
// //////////////
+
+ // -- Location Management Service
+ public void onUpdateLocationRequest(UpdateLocationRequest ind) {
+ // TODO
+ }
+
+ public void onUpdateLocationResponse(UpdateLocationResponse ind) {
+ // TODO
+ }
+
+ // -- Authentication management services
public void onSendAuthenticationInfoRequest(SendAuthenticationInfoRequest
ind) {
MAPDialogMobilityWrapper mapDialogMobilityWrapper =
(MAPDialogMobilityWrapper) ind.getMAPDialog()
.getUserObject();
@@ -972,12 +967,30 @@
onEvent(event.getEventTypeName(), mapDialogMobilityWrapper,
event);
}
- public void onUpdateLocationRequest(UpdateLocationRequest ind) {
- // TODO
+ // -- Subscriber Information services
+ public void onAnyTimeInterrogationRequest(AnyTimeInterrogationRequest
anyTimeInterrogationRequest) {
+ MAPDialogMobilityWrapper mapDialogMobilityWrapper =
(MAPDialogMobilityWrapper) anyTimeInterrogationRequest
+ .getMAPDialog().getUserObject();
+ AnyTimeInterrogationRequestWrapper event = new
AnyTimeInterrogationRequestWrapper(mapDialogMobilityWrapper,
+ anyTimeInterrogationRequest);
+ onEvent(event.getEventTypeName(), mapDialogMobilityWrapper,
event);
}
- public void onUpdateLocationResponse(UpdateLocationResponse ind) {
- // TODO
+ public void onAnyTimeInterrogationResponse(AnyTimeInterrogationResponse
anyTimeInterrogationResponse) {
+ MAPDialogMobilityWrapper mapDialogMobilityWrapper =
(MAPDialogMobilityWrapper) anyTimeInterrogationResponse
+ .getMAPDialog().getUserObject();
+ AnyTimeInterrogationResponseWrapper event = new
AnyTimeInterrogationResponseWrapper(mapDialogMobilityWrapper,
+ anyTimeInterrogationResponse);
+ onEvent(event.getEventTypeName(), mapDialogMobilityWrapper,
event);
+ }
+
+ // -- International mobile equipment identities management services
+ public void onCheckImeiRequest(CheckImeiRequest request){
+ //TODO
+ }
+
+ public void onCheckImeiResponse(CheckImeiResponse response){
+ //TODO
}
/*
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPDialogMobilityWrapper.java
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPDialogMobilityWrapper.java
Mon Jul 23 21:48:52 2012
@@ -2,6 +2,7 @@
import org.mobicents.protocols.ss7.map.api.MAPException;
import org.mobicents.protocols.ss7.map.api.primitives.GSNAddress;
+import org.mobicents.protocols.ss7.map.api.primitives.IMEI;
import org.mobicents.protocols.ss7.map.api.primitives.IMSI;
import org.mobicents.protocols.ss7.map.api.primitives.ISDNAddressString;
import org.mobicents.protocols.ss7.map.api.primitives.LMSI;
@@ -13,10 +14,12 @@
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.EpsAuthenticationSetList;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.ReSynchronisationInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.authentication.RequestingNodeType;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.imei.RequestedEquipmentInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.ADDInfo;
import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.PagingArea;
-import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.VlrCapability;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.locationManagement.VLRCapability;
import
org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.RequestedInfo;
+import
org.mobicents.protocols.ss7.map.api.service.mobility.subscriberInformation.SubscriberInfo;
import org.mobicents.slee.resource.map.MAPDialogActivityHandle;
import org.mobicents.slee.resource.map.MAPResourceAdaptor;
import org.mobicents.slee.resource.map.wrappers.MAPDialogWrapper;
@@ -33,6 +36,7 @@
super(wrappedDialog, activityHandle, ra);
}
+ @Override
public Long addSendAuthenticationInfoRequest(IMSI imsi, int
numberOfRequestedVectors,
boolean segmentationProhibited, boolean
immediateResponsePreferred,
ReSynchronisationInfo reSynchronisationInfo, MAPExtensionContainer
extensionContainer,
@@ -43,6 +47,7 @@
requestingNodeType, requestingPlmnId,
numberOfRequestedAdditionalVectors, additionalVectorsAreForEPS);
}
+ @Override
public Long addSendAuthenticationInfoRequest(int customInvokeTimeout,
IMSI imsi, int numberOfRequestedVectors,
boolean segmentationProhibited, boolean
immediateResponsePreferred,
ReSynchronisationInfo reSynchronisationInfo, MAPExtensionContainer
extensionContainer,
@@ -53,6 +58,7 @@
requestingNodeType, requestingPlmnId,
numberOfRequestedAdditionalVectors, additionalVectorsAreForEPS);
}
+ @Override
public void addSendAuthenticationInfoResponse(long invokeId,
AuthenticationSetList authenticationSetList,
MAPExtensionContainer extensionContainer, EpsAuthenticationSetList
epsAuthenticationSetList)
throws MAPException {
@@ -60,6 +66,7 @@
epsAuthenticationSetList);
}
+ @Override
public long addAnyTimeInterrogationRequest(SubscriberIdentity
subscriberIdentity, RequestedInfo requestedInfo,
ISDNAddressString gsmSCFAddress, MAPExtensionContainer
extensionContainer) throws MAPException {
return
this.wrappedDialog.addAnyTimeInterrogationRequest(subscriberIdentity,
requestedInfo, gsmSCFAddress,
@@ -75,14 +82,14 @@
}
@Override
- public long addAnyTimeInterrogationResponse(long invokeId) throws
MAPException {
- return this.addAnyTimeInterrogationResponse(invokeId);
+ public void addAnyTimeInterrogationResponse(long invokeId, SubscriberInfo
subscriberInfo, MAPExtensionContainer extensionContainer) throws
MAPException {
+ this.addAnyTimeInterrogationResponse(invokeId, subscriberInfo,
extensionContainer);
}
@Override
public Long addUpdateLocationRequest(IMSI imsi, ISDNAddressString
mscNumber, ISDNAddressString roamingNumber,
ISDNAddressString vlrNumber, LMSI lmsi, MAPExtensionContainer
extensionContainer,
- VlrCapability vlrCapability, boolean informPreviousNetworkEntity,
boolean csLCSNotSupportedByUE,
+ VLRCapability vlrCapability, boolean informPreviousNetworkEntity,
boolean csLCSNotSupportedByUE,
GSNAddress vGmlcAddress, ADDInfo addInfo, PagingArea pagingArea,
boolean skipSubscriberDataUpdate,
boolean restorationIndicator) throws MAPException {
return this.wrappedDialog.addUpdateLocationRequest(imsi, mscNumber,
roamingNumber, vlrNumber, lmsi,
@@ -93,7 +100,7 @@
@Override
public Long addUpdateLocationRequest(int customInvokeTimeout, IMSI imsi,
ISDNAddressString mscNumber,
ISDNAddressString roamingNumber, ISDNAddressString
vlrNumber, LMSI lmsi,
- MAPExtensionContainer extensionContainer, VlrCapability vlrCapability,
boolean informPreviousNetworkEntity,
+ MAPExtensionContainer extensionContainer, VLRCapability vlrCapability,
boolean informPreviousNetworkEntity,
boolean csLCSNotSupportedByUE, GSNAddress vGmlcAddress, ADDInfo
addInfo, PagingArea pagingArea,
boolean skipSubscriberDataUpdate, boolean restorationIndicator) throws
MAPException {
return this.wrappedDialog.addUpdateLocationRequest(customInvokeTimeout,
imsi, mscNumber, roamingNumber,
@@ -113,5 +120,11 @@
public MAPDialogMobility getWrappedDialog() {
return this.wrappedDialog;
}
+
+ @Override
+ public Long addCheckImeiRequest(IMEI imei, RequestedEquipmentInfo
requestedEquipmentInfo, MAPExtensionContainer extensionContainer)
+ throws MAPException {
+ return this.wrappedDialog.addCheckImeiRequest(imei,
requestedEquipmentInfo, extensionContainer);
+ }
}