Revision: 9311c6114765
Author: Sergey Vetyutnev <[email protected]>
Date: Mon Sep 3 02:19:28 2012
Log: MAP RA / CAP RA update to fit MAP/CAP core update
http://code.google.com/p/jain-slee/source/detail?r=9311c6114765&repo=ss7
Modified:
/resources/cap/du/pom.xml
/resources/cap/events/pom.xml
/resources/cap/library/pom.xml
/resources/cap/ra/pom.xml
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/SpecializedResourceReportRequestWrapper.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPProviderWrapper.java
/resources/cap/ratype/pom.xml
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
=======================================
--- /resources/cap/du/pom.xml Sat Sep 1 07:28:22 2012
+++ /resources/cap/du/pom.xml Mon Sep 3 02:19:28 2012
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-slee-ra-map</artifactId>
+ <artifactId>mobicents-slee-ra-cap</artifactId>
<groupId>org.mobicents.resources</groupId>
<version>2.8.0-SNAPSHOT</version>
</parent>
=======================================
--- /resources/cap/events/pom.xml Sat Sep 1 07:28:22 2012
+++ /resources/cap/events/pom.xml Mon Sep 3 02:19:28 2012
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-slee-ra-map</artifactId>
+ <artifactId>mobicents-slee-ra-cap</artifactId>
<groupId>org.mobicents.resources</groupId>
<version>2.8.0-SNAPSHOT</version>
</parent>
=======================================
--- /resources/cap/library/pom.xml Sat Sep 1 07:28:22 2012
+++ /resources/cap/library/pom.xml Mon Sep 3 02:19:28 2012
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-slee-ra-map</artifactId>
+ <artifactId>mobicents-slee-ra-cap</artifactId>
<groupId>org.mobicents.resources</groupId>
<version>2.8.0-SNAPSHOT</version>
</parent>
=======================================
--- /resources/cap/ra/pom.xml Sat Sep 1 07:28:22 2012
+++ /resources/cap/ra/pom.xml Mon Sep 3 02:19:28 2012
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-slee-ra-map</artifactId>
+ <artifactId>mobicents-slee-ra-cap</artifactId>
<groupId>org.mobicents.resources</groupId>
<version>2.8.0-SNAPSHOT</version>
</parent>
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/SpecializedResourceReportRequestWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/SpecializedResourceReportRequestWrapper.java
Mon Sep 3 02:19:28 2012
@@ -37,12 +37,12 @@
super(capDialog, EVENT_TYPE_NAME, req);
}
- public boolean IsAllAnnouncementsComplete() {
- return this.wrappedEvent.IsAllAnnouncementsComplete();
+ public boolean getAllAnnouncementsComplete() {
+ return this.wrappedEvent.getAllAnnouncementsComplete();
}
- public boolean IsFirstAnnouncementStarted() {
- return this.wrappedEvent.IsFirstAnnouncementStarted();
+ public boolean getFirstAnnouncementStarted() {
+ return this.wrappedEvent.getFirstAnnouncementStarted();
}
@Override
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Mon Sep 3 02:19:28 2012
@@ -31,6 +31,7 @@
import org.mobicents.protocols.ss7.cap.api.dialog.CAPUserAbortReason;
import org.mobicents.protocols.ss7.cap.api.errors.CAPErrorMessage;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
+import org.mobicents.protocols.ss7.tcap.api.MessageType;
import org.mobicents.protocols.ss7.tcap.asn.comp.Invoke;
import org.mobicents.protocols.ss7.tcap.asn.comp.Problem;
import org.mobicents.protocols.ss7.tcap.asn.comp.ReturnResultLast;
@@ -70,10 +71,6 @@
public boolean cancelInvocation(Long arg0) throws CAPException {
return this.wrappedDialog.cancelInvocation(arg0);
}
-
- public void close(boolean arg0) throws CAPException {
- this.wrappedDialog.close(arg0);
- }
public CAPApplicationContext getApplicationContext() {
return this.wrappedDialog.getApplicationContext();
@@ -126,6 +123,31 @@
public void send() throws CAPException {
this.wrappedDialog.send();
}
+
+ @Override
+ public void sendDelayed() throws CAPException {
+ this.wrappedDialog.sendDelayed();
+ }
+
+ public void close(boolean arg0) throws CAPException {
+ this.wrappedDialog.close(arg0);
+ }
+
+ public void closeDelayed(boolean arg0) throws CAPException {
+ this.wrappedDialog.closeDelayed(arg0);
+ }
+
+ public CAPGprsReferenceNumber getGprsReferenceNumber() {
+ return this.wrappedDialog.getGprsReferenceNumber();
+ }
+
+ public CAPGprsReferenceNumber getReceivedGprsReferenceNumber() {
+ return this.wrappedDialog.getReceivedGprsReferenceNumber();
+ }
+
+ public MessageType getTCAPMessageType() {
+ return this.wrappedDialog.getTCAPMessageType();
+ }
public void sendErrorComponent(Long arg0, CAPErrorMessage arg1) throws
CAPException {
this.wrappedDialog.sendErrorComponent(arg0, arg1);
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPProviderWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPProviderWrapper.java
Mon Sep 3 02:19:28 2012
@@ -30,6 +30,9 @@
import
org.mobicents.protocols.ss7.cap.api.service.circuitSwitchedCall.CAPServiceCircuitSwitchedCall;
import org.mobicents.protocols.ss7.cap.api.service.gprs.CAPServiceGprs;
import org.mobicents.protocols.ss7.cap.api.service.sms.CAPServiceSms;
+import org.mobicents.protocols.ss7.inap.api.INAPParameterFactory;
+import org.mobicents.protocols.ss7.isup.ISUPParameterFactory;
+import org.mobicents.protocols.ss7.map.api.MAPParameterFactory;
import org.mobicents.slee.resource.cap.CAPDialogActivityHandle;
import org.mobicents.slee.resource.cap.CAPResourceAdaptor;
import
org.mobicents.slee.resource.cap.service.circuitSwitchedCall.wrappers.CAPServiceCircuitSwitchedCallWrapper;
@@ -78,6 +81,27 @@
}
return this.wrappedProvider.getCAPParameterFactory();
}
+
+ public INAPParameterFactory getINAPParameterFactory() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedProvider.getINAPParameterFactory();
+ }
+
+ public ISUPParameterFactory getISUPParameterFactory() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedProvider.getISUPParameterFactory();
+ }
+
+ public MAPParameterFactory getMAPParameterFactory() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedProvider.getMAPParameterFactory();
+ }
public CAPErrorMessageFactory getCAPErrorMessageFactory() {
if (this.wrappedProvider == null) {
=======================================
--- /resources/cap/ratype/pom.xml Sat Sep 1 07:28:22 2012
+++ /resources/cap/ratype/pom.xml Mon Sep 3 02:19:28 2012
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>mobicents-slee-ra-map</artifactId>
+ <artifactId>mobicents-slee-ra-cap</artifactId>
<groupId>org.mobicents.resources</groupId>
<version>2.8.0-SNAPSHOT</version>
</parent>
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Mon Sep 3 02:19:28 2012
@@ -12,6 +12,7 @@
import org.mobicents.protocols.ss7.map.api.primitives.IMSI;
import
org.mobicents.protocols.ss7.map.api.primitives.MAPExtensionContainer;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
+import org.mobicents.protocols.ss7.tcap.api.MessageType;
import org.mobicents.protocols.ss7.tcap.asn.comp.Invoke;
import org.mobicents.protocols.ss7.tcap.asn.comp.Problem;
import org.mobicents.protocols.ss7.tcap.asn.comp.ReturnResult;
@@ -62,6 +63,30 @@
public void close(boolean arg0) throws MAPException {
this.wrappedDialog.close(arg0);
}
+
+ public void closeDelayed(boolean prearrangedEnd) throws MAPException {
+ this.wrappedDialog.closeDelayed(prearrangedEnd);
+ }
+
+ @Override
+ public MessageType getTCAPMessageType() {
+ return this.wrappedDialog.getTCAPMessageType();
+ }
+
+ @Override
+ public AddressString getReceivedOrigReference() {
+ return this.wrappedDialog.getReceivedOrigReference();
+ }
+
+ @Override
+ public AddressString getReceivedDestReference() {
+ return this.wrappedDialog.getReceivedDestReference();
+ }
+
+ @Override
+ public MAPExtensionContainer getReceivedExtensionContainer() {
+ return this.wrappedDialog.getReceivedExtensionContainer();
+ }
public MAPApplicationContext getApplicationContext() {
return this.wrappedDialog.getApplicationContext();
@@ -123,6 +148,10 @@
public void send() throws MAPException {
this.wrappedDialog.send();
}
+
+ public void sendDelayed() throws MAPException {
+ this.wrappedDialog.sendDelayed();
+ }
public void sendErrorComponent(Long arg0, MAPErrorMessage arg1) throws
MAPException {
this.wrappedDialog.sendErrorComponent(arg0, arg1);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
Sun Sep 2 11:25:03 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPProviderWrapper.java
Mon Sep 3 02:19:28 2012
@@ -107,6 +107,13 @@
}
return this.wrappedProvider.getMAPParameterFactory();
}
+
+ public MAPSmsTpduParameterFactory getMAPSmsTpduParameterFactory() {
+ if (this.wrappedProvider == null) {
+ throw new IllegalStateException("RA is has not been
activated.");
+ }
+ return this.wrappedProvider.getMAPSmsTpduParameterFactory();
+ }
/*
* (non-Javadoc)
@@ -219,10 +226,5 @@
public MAPResourceAdaptor getRa() {
return ra;
}
-
- @Override
- public MAPSmsTpduParameterFactory getMAPSmsTpduParameterFactory() {
- return this.wrappedProvider.getMAPSmsTpduParameterFactory();
- }
}
