Revision: 22782
Author: [email protected]
Date: Tue Aug 7 03:52:49 2012
Log: MAP RA update to include last implemented MAP operations
http://code.google.com/p/mobicents/source/detail?r=22782
Modified:
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSRequestWrapper.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSResponseWrapper.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/SupplementaryMessageWrapper.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/UnstructuredSSNotifyRequestWrapper.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
/trunk/servers/jain-slee/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSRequestWrapper.java
Mon May 7 06:18:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSRequestWrapper.java
Tue Aug 7 03:52:49 2012
@@ -24,6 +24,7 @@
import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
import org.mobicents.protocols.ss7.map.api.primitives.ISDNAddressString;
+import org.mobicents.protocols.ss7.map.api.primitives.USSDString;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.ProcessUnstructuredSSRequest;
/**
@@ -51,6 +52,14 @@
public ISDNAddressString getMSISDNAddressString() {
return this.wrappedEvent.getMSISDNAddressString();
}
+
+ public byte getUSSDDataCodingScheme() {
+ return this.wrappedEvent.getUSSDDataCodingScheme();
+ }
+
+ public USSDString getUSSDString() {
+ return this.wrappedEvent.getUSSDString();
+ }
/*
* (non-Javadoc)
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSResponseWrapper.java
Mon May 7 06:18:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/ProcessUnstructuredSSResponseWrapper.java
Tue Aug 7 03:52:49 2012
@@ -22,6 +22,7 @@
package org.mobicents.slee.resource.map.service.supplementary.wrappers;
+import org.mobicents.protocols.ss7.map.api.primitives.USSDString;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.ProcessUnstructuredSSResponse;
/**
@@ -41,6 +42,14 @@
ProcessUnstructuredSSResponse res) {
super(mAPDialog, EVENT_TYPE_NAME, res);
}
+
+ public byte getUSSDDataCodingScheme() {
+ return this.wrappedEvent.getUSSDDataCodingScheme();
+ }
+
+ public USSDString getUSSDString() {
+ return this.wrappedEvent.getUSSDString();
+ }
/*
* (non-Javadoc)
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/SupplementaryMessageWrapper.java
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/SupplementaryMessageWrapper.java
Tue Aug 7 03:52:49 2012
@@ -1,6 +1,5 @@
package org.mobicents.slee.resource.map.service.supplementary.wrappers;
-import org.mobicents.protocols.ss7.map.api.primitives.USSDString;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.MAPDialogSupplementary;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.SupplementaryMessage;
import org.mobicents.slee.resource.map.wrappers.MAPMessageWrapper;
@@ -21,13 +20,5 @@
public MAPDialogSupplementary getMAPDialog() {
return (MAPDialogSupplementaryWrapper) this.mapDialogWrapper;
}
-
- public byte getUSSDDataCodingScheme() {
- return this.wrappedEvent.getUSSDDataCodingScheme();
- }
-
- public USSDString getUSSDString() {
- return this.wrappedEvent.getUSSDString();
- }
}
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/UnstructuredSSNotifyRequestWrapper.java
Mon May 7 06:18:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/UnstructuredSSNotifyRequestWrapper.java
Tue Aug 7 03:52:49 2012
@@ -24,6 +24,7 @@
import org.mobicents.protocols.ss7.map.api.primitives.AlertingPattern;
import org.mobicents.protocols.ss7.map.api.primitives.ISDNAddressString;
+import org.mobicents.protocols.ss7.map.api.primitives.USSDString;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.UnstructuredSSNotifyRequest;
/**
@@ -51,6 +52,14 @@
public ISDNAddressString getMSISDNAddressString() {
return this.wrappedEvent.getMSISDNAddressString();
}
+
+ public byte getUSSDDataCodingScheme() {
+ return this.wrappedEvent.getUSSDDataCodingScheme();
+ }
+
+ public USSDString getUSSDString() {
+ return this.wrappedEvent.getUSSDString();
+ }
/*
* (non-Javadoc)
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Tue Aug 7 03:52:49 2012
@@ -36,7 +36,7 @@
this.activityHandle.setActivity(this);
this.ra = ra;
}
-
+
public SccpAddress getLocalAddress(){
return this.wrappedDialog.getLocalAddress();
}
=======================================
---
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
Tue Aug 7 03:52:49 2012
@@ -27,14 +27,20 @@
import org.mobicents.protocols.ss7.map.api.MAPParameterFactory;
import org.mobicents.protocols.ss7.map.api.MAPProvider;
import org.mobicents.protocols.ss7.map.api.errors.MAPErrorMessageFactory;
+import
org.mobicents.protocols.ss7.map.api.service.callhandling.MAPServiceCallHandling;
import org.mobicents.protocols.ss7.map.api.service.lsm.MAPServiceLsm;
import
org.mobicents.protocols.ss7.map.api.service.mobility.MAPServiceMobility;
+import org.mobicents.protocols.ss7.map.api.service.oam.MAPServiceOam;
+import
org.mobicents.protocols.ss7.map.api.service.pdpContextActivation.MAPServicePdpContextActivation;
import org.mobicents.protocols.ss7.map.api.service.sms.MAPServiceSms;
import
org.mobicents.protocols.ss7.map.api.service.supplementary.MAPServiceSupplementary;
import org.mobicents.slee.resource.map.MAPDialogActivityHandle;
import org.mobicents.slee.resource.map.MAPResourceAdaptor;
+import
org.mobicents.slee.resource.map.service.callhandling.wrappers.MAPServiceCallHandlingWrapper;
import
org.mobicents.slee.resource.map.service.lsm.wrappers.MAPServiceLsmWrapper;
import
org.mobicents.slee.resource.map.service.mobility.wrappers.MAPServiceMobilityWrapper;
+import
org.mobicents.slee.resource.map.service.oam.wrappers.MAPServiceOamWrapper;
+import
org.mobicents.slee.resource.map.service.pdpContextActivation.wrappers.MAPServicePdpContextActivationWrapper;
import
org.mobicents.slee.resource.map.service.sms.wrappers.MAPServiceSmsWrapper;
import
org.mobicents.slee.resource.map.service.supplementary.wrappers.MAPServiceSupplementaryWrapper;
@@ -49,11 +55,14 @@
// Wrappers for MAP specifics //
// //////////////////////////////
private MAPProvider wrappedProvider;
+ private MAPServiceMobilityWrapper wrappedMAPServiceMobility;
+ private MAPServiceCallHandlingWrapper wrappedMAPServiceCallHandling;
+ private MAPServiceOamWrapper wrappedMAPServiceOam;
+ private MAPServicePdpContextActivationWrapper
wrappedMAPServicePdpContextActivation;
private MAPServiceSupplementaryWrapper wrappedUSSD;
- private MAPServiceLsmWrapper wrappedLSM;
private MAPServiceSmsWrapper wrappedSMS;
- private MAPServiceMobilityWrapper wrappedMAPServiceMobility;
-
+ private MAPServiceLsmWrapper wrappedLSM;
+
private final MAPResourceAdaptor ra;
/**
@@ -120,13 +129,41 @@
*
org.mobicents.protocols.ss7.map.api.MAPProvider#getMAPDialog(java.lang
* .Long)
*/
- public MAPDialog getMAPDialog(Long long1) {
+ public MAPDialog getMAPDialog(Long dialogId) {
if (this.wrappedProvider == null) {
throw new IllegalStateException("RA is has not been
activated.");
}
- MAPDialogActivityHandle ah = new MAPDialogActivityHandle(long1);
+ MAPDialogActivityHandle ah = new
MAPDialogActivityHandle(dialogId);
return (MAPDialog) this.ra.getActivity(ah);
}
+
+ public MAPServiceMobility getMAPServiceMobility() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedMAPServiceMobility;
+ }
+
+ public MAPServiceCallHandling getMAPServiceCallHandling() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedMAPServiceCallHandling;
+ }
+
+ public MAPServiceOam getMAPServiceOam() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedMAPServiceOam;
+ }
+
+ public MAPServicePdpContextActivation getMAPServicePdpContextActivation()
{
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedMAPServicePdpContextActivation;
+ }
/*
* (non-Javadoc)
@@ -165,20 +202,17 @@
}
return this.wrappedLSM;
}
-
- public MAPServiceMobility getMAPServiceMobility() {
- if (this.wrappedProvider == null) {
- throw new IllegalStateException("RA is has not been
activated.");
- }
- return this.wrappedMAPServiceMobility;
- }
public void setWrappedProvider(MAPProvider wrappedProvider) {
this.wrappedProvider = wrappedProvider;
+
+ this.wrappedMAPServiceMobility = new MAPServiceMobilityWrapper(this,
wrappedProvider.getMAPServiceMobility());
+ this.wrappedMAPServiceCallHandling = new
MAPServiceCallHandlingWrapper(this,
wrappedProvider.getMAPServiceCallHandling());
+ this.wrappedMAPServiceOam = new MAPServiceOamWrapper(this,
wrappedProvider.getMAPServiceOam());
+ this.wrappedMAPServicePdpContextActivation = new
MAPServicePdpContextActivationWrapper(this,
wrappedProvider.getMAPServicePdpContextActivation());
this.wrappedUSSD = new MAPServiceSupplementaryWrapper(this,
wrappedProvider.getMAPServiceSupplementary());
this.wrappedLSM = new MAPServiceLsmWrapper(this,
wrappedProvider.getMAPServiceLsm());
this.wrappedSMS = new MAPServiceSmsWrapper(this,
wrappedProvider.getMAPServiceSms());
- this.wrappedMAPServiceMobility = new MAPServiceMobilityWrapper(this,
wrappedProvider.getMAPServiceMobility());
}
public MAPResourceAdaptor getRa() {
=======================================
---
/trunk/servers/jain-slee/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Sun Jun 3 04:56:54 2012
+++
/trunk/servers/jain-slee/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Tue Aug 7 03:52:49 2012
@@ -39,6 +39,8 @@
</resource-adaptor-interface>
</resource-adaptor-type-classes>
+
+ <!-- Dialog Events -->
<event-type-ref>
<event-type-name>ss7.map.DIALOG_DELIMITER</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
@@ -99,78 +101,115 @@
<event-type-version>1.0</event-type-version>
</event-type-ref>
- <!-- SERVICE: suplementary -->
+
+ <!-- Service Specific -->
+
+ <!-- Mobility - Location Management Service -->
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.mobility.locationManagement.UPDATE_LOCATION_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.mobility.locationManagement.UPDATE_LOCATION_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
+ <!-- Mobility - Handover services -->
+
+ <!-- Mobility - Authentication management -->
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.PROCESS_UNSTRUCTURED_SS_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.mobility.authentication.SEND_AUTHENTICATION_INFO_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
-
+
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.PROCESS_UNSTRUCTURED_SS_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.mobility.authentication.SEND_AUTHENTICATION_INFO_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <!-- Mobility - IMEI management -->
+ <event-type-ref>
+
<event-type-name>ss7.map.service.mobility.imei.CHECK_IMEI_REQUEST</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
</event-type-ref>
-
+
+ <event-type-ref>
+
<event-type-name>ss7.map.service.mobility.imei.CHECK_IMEI_RESPONSE</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <!-- Mobility - Subscriber management -->
+
+ <!-- Mobility - Fault recovery management -->
+
+ <!-- Mobility - Subscriber Information services -->
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_NOTIFY_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.mobility.subscriberinfo.ANY_TIME_INTERROGATION_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_NOTIFY_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.mobility.subscriberinfo.ANY_TIME_INTERROGATION_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
- </event-type-ref>
-
-
- <!-- SERVICE: lsm -->
+ </event-type-ref>
+
+ <!-- OAM -->
+
+ <!-- Call Handling -->
+ <event-type-ref>
+
<event-type-name>ss7.map.service.callhandling.SEND_ROUTING_INFORMATION_REQUEST</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.PROVIDE_SUBSCRIBER_LOCATION_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.callhandling.SEND_ROUTING_INFORMATION_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <!-- SERVICE: suplementary -->
+ <event-type-ref>
+
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_REQUEST</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.PROVIDE_SUBSCRIBER_LOCATION_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.SEND_ROUTING_INFO_FOR_LCS_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.suplementary.PROCESS_UNSTRUCTURED_SS_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.SEND_ROUTING_INFO_FOR_LCS_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.suplementary.PROCESS_UNSTRUCTURED_SS_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.SUBSCRIBER_LOCATION_REPORT_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_NOTIFY_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.lsm.SUBSCRIBER_LOCATION_REPORT_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.suplementary.UNSTRUCTURED_SS_NOTIFY_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
@@ -254,31 +293,44 @@
<event-type-version>1.0</event-type-version>
</event-type-ref>
- <!-- SERVICE: Mobility Authentication -->
+ <!-- Network-Requested PDP Context Activation services -->
+
+ <!-- SERVICE: lsm -->
<event-type-ref>
-
<event-type-name>ss7.map.service.mobility.authentication.SEND_AUTHENTICATION_INFO_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.lsm.PROVIDE_SUBSCRIBER_LOCATION_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
-
+
<event-type-ref>
-
<event-type-name>ss7.map.service.mobility.authentication.SEND_AUTHENTICATION_INFO_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.lsm.PROVIDE_SUBSCRIBER_LOCATION_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
- </event-type-ref>
-
- <!-- SERVICE: Mobility Subscriber Information services -->
+ </event-type-ref>
+
<event-type-ref>
-
<event-type-name>ss7.map.service.mobility.subscriberinfo.ANY_TIME_INTERROGATION_REQUEST</event-type-name>
+
<event-type-name>ss7.map.service.lsm.SEND_ROUTING_INFO_FOR_LCS_REQUEST</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
</event-type-ref>
<event-type-ref>
-
<event-type-name>ss7.map.service.mobility.subscriberinfo.ANY_TIME_INTERROGATION_RESPONSE</event-type-name>
+
<event-type-name>ss7.map.service.lsm.SEND_ROUTING_INFO_FOR_LCS_RESPONSE</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
<event-type-version>1.0</event-type-version>
- </event-type-ref>
+ </event-type-ref>
+
+ <event-type-ref>
+
<event-type-name>ss7.map.service.lsm.SUBSCRIBER_LOCATION_REPORT_REQUEST</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
+
+ <event-type-ref>
+
<event-type-name>ss7.map.service.lsm.SUBSCRIBER_LOCATION_REPORT_RESPONSE</event-type-name>
+ <event-type-vendor>org.mobicents</event-type-vendor>
+ <event-type-version>1.0</event-type-version>
+ </event-type-ref>
<!-- Component stuff -->
<event-type-ref>