Revision: 9a6631c0890b
Author: Sergey Vetyutnev <[email protected]>
Date: Sat Jan 5 01:57:11 2013
Log: Update to fit core TCAP/MAP/CAP abnormal processing updates
http://code.google.com/p/jain-slee/source/detail?r=9a6631c0890b&repo=ss7
Deleted:
/resources/cap/events/src/main/java/org/mobicents/slee/resource/cap/events/ProviderErrorComponent.java
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/ProviderErrorComponent.java
Modified:
/resources/cap/events/src/main/java/org/mobicents/slee/resource/cap/events/RejectComponent.java
/resources/cap/events/src/main/resources/META-INF/event-jar.xml
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
/resources/cap/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/DialogReject.java
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/RejectComponent.java
/resources/map/events/src/main/resources/META-INF/event-jar.xml
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPDialogCallHandlingWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ComponentEventImpl.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ProviderAbortEventImpl.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/RejectEventImpl.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
=======================================
---
/resources/cap/events/src/main/java/org/mobicents/slee/resource/cap/events/ProviderErrorComponent.java
Sat Sep 1 07:28:22 2012
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.mobicents.slee.resource.cap.events;
-
-import org.mobicents.protocols.ss7.cap.api.CAPDialog;
-import org.mobicents.protocols.ss7.cap.api.dialog.CAPComponentErrorReason;
-
-
-/**
- *
- * @author sergey vetyutnev
- *
- */
-public class ProviderErrorComponent extends ComponentEvent {
-
- private static final String EVENT_TYPE_NAME
= "ss7.cap.PROVIDER_ERROR_COMPONENT";
-
- protected CAPComponentErrorReason providerError;
-
- /**
- * @param capDialogWrapper
- * @param invokeId
- */
- public ProviderErrorComponent(CAPDialog cAPDialog, Long invokeId,
CAPComponentErrorReason providerError) {
- super(cAPDialog, invokeId, EVENT_TYPE_NAME);
- this.providerError = providerError;
- }
-
- public CAPComponentErrorReason getProviderError() {
- return this.providerError;
- }
-
- @Override
- public String toString() {
- return "ProviderErrorComponent [providerError=" + providerError + ",
invokeId=" + invokeId
- + ", capDialogWrapper=" + capDialogWrapper +
"]";
- }
-
-}
=======================================
---
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/ProviderErrorComponent.java
Sat Sep 1 07:01:36 2012
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.mobicents.slee.resource.map.events;
-
-import org.mobicents.protocols.ss7.map.api.MAPDialog;
-import org.mobicents.protocols.ss7.map.api.dialog.MAPProviderError;
-
-/**
- * @author baranowb
- *
- */
-public class ProviderErrorComponent extends ComponentEvent {
-
- private static final String EVENT_TYPE_NAME
= "ss7.map.PROVIDER_ERROR_COMPONENT";
-
- protected MAPProviderError mapProviderError;
-
- /**
- * @param mapDialogWrapper
- * @param invokeId
- */
- public ProviderErrorComponent(MAPDialog mAPDialog, Long invokeId,
MAPProviderError mapProviderError) {
- super(mAPDialog, invokeId, EVENT_TYPE_NAME);
- this.mapProviderError = mapProviderError;
- }
-
- public MAPProviderError getMAPProviderError() {
- return this.mapProviderError;
- }
-
- @Override
- public String toString() {
- return "ProviderErrorComponent [mapProviderError=" + mapProviderError
+ ", invokeId=" + invokeId
- + ", mapDialogWrapper=" + mapDialogWrapper +
"]";
- }
-
-}
=======================================
---
/resources/cap/events/src/main/java/org/mobicents/slee/resource/cap/events/RejectComponent.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/events/src/main/java/org/mobicents/slee/resource/cap/events/RejectComponent.java
Sat Jan 5 01:57:11 2013
@@ -36,24 +36,30 @@
private static final String EVENT_TYPE_NAME =
"ss7.cap.REJECT_COMPONENT";
protected Problem problem;
+ protected boolean isLocalOriginated;
/**
* @param capDialogWrapper
* @param invokeId
*/
- public RejectComponent(CAPDialog cAPDialog, Long invokeId, Problem
problem) {
+ public RejectComponent(CAPDialog cAPDialog, Long invokeId, Problem
problem, boolean isLocalOriginated) {
super(cAPDialog, invokeId, EVENT_TYPE_NAME);
this.problem = problem;
+ this.isLocalOriginated = isLocalOriginated;
}
public Problem getProblem() {
return this.problem;
}
+
+ public boolean getIsLocalOriginated() {
+ return this.isLocalOriginated;
+ }
@Override
public String toString() {
- return "RejectComponent [problem=" + problem + ", invokeId=" + invokeId
+ ", capDialogWrapper="
- + capDialogWrapper + "]";
+ return "RejectComponent [problem=" + problem + ", invokeId=" + invokeId
+ ", capDialogWrapper=" + capDialogWrapper
+ + (this.isLocalOriginated ? ", localOriginated" : ",
remoteOriginated") + "]";
}
}
=======================================
--- /resources/cap/events/src/main/resources/META-INF/event-jar.xml Sat
Sep 1 07:28:22 2012
+++ /resources/cap/events/src/main/resources/META-INF/event-jar.xml Sat
Jan 5 01:57:11 2013
@@ -262,13 +262,6 @@
<event-class-name>org.mobicents.slee.resource.cap.events.ErrorComponent</event-class-name>
</event-definition>
- <event-definition>
-
<event-type-name>ss7.cap.PROVIDER_ERROR_COMPONENT</event-type-name>
- <event-type-vendor>org.mobicents</event-type-vendor>
- <event-type-version>1.0</event-type-version>
-
<event-class-name>org.mobicents.slee.resource.cap.events.ProviderErrorComponent</event-class-name>
- </event-definition>
-
<event-definition>
<event-type-name>ss7.cap.REJECT_COMPONENT</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
Sat Jan 5 01:57:11 2013
@@ -50,7 +50,6 @@
import org.mobicents.protocols.ss7.cap.api.CAPDialogListener;
import org.mobicents.protocols.ss7.cap.api.CAPMessage;
import org.mobicents.protocols.ss7.cap.api.CAPProvider;
-import org.mobicents.protocols.ss7.cap.api.dialog.CAPComponentErrorReason;
import org.mobicents.protocols.ss7.cap.api.dialog.CAPDialogState;
import org.mobicents.protocols.ss7.cap.api.dialog.CAPGeneralAbortReason;
import org.mobicents.protocols.ss7.cap.api.dialog.CAPGprsReferenceNumber;
@@ -101,7 +100,6 @@
import org.mobicents.slee.resource.cap.events.DialogUserAbort;
import org.mobicents.slee.resource.cap.events.ErrorComponent;
import org.mobicents.slee.resource.cap.events.InvokeTimeout;
-import org.mobicents.slee.resource.cap.events.ProviderErrorComponent;
import org.mobicents.slee.resource.cap.events.RejectComponent;
import
org.mobicents.slee.resource.cap.service.circuitSwitchedCall.wrappers.ActivityTestRequestWrapper;
import
org.mobicents.slee.resource.cap.service.circuitSwitchedCall.wrappers.ActivityTestResponseWrapper;
@@ -549,9 +547,9 @@
onEvent(errorComponent.getEventTypeName(), capDialogWrapper,
errorComponent);
}
- public void onRejectComponent(CAPDialog capDialog, Long invokeId, Problem
problem) {
+ public void onRejectComponent(CAPDialog capDialog, Long invokeId, Problem
problem, boolean isLocalOriginated) {
CAPDialogWrapper capDialogWrapper = (CAPDialogWrapper)
capDialog.getUserObject();
- RejectComponent rejectComponent = new RejectComponent(capDialogWrapper,
invokeId, problem);
+ RejectComponent rejectComponent = new RejectComponent(capDialogWrapper,
invokeId, problem, isLocalOriginated);
onEvent(rejectComponent.getEventTypeName(), capDialogWrapper,
rejectComponent);
}
@@ -560,13 +558,6 @@
InvokeTimeout invokeTimeout = new InvokeTimeout(capDialogWrapper,
invokeId);
onEvent(invokeTimeout.getEventTypeName(), capDialogWrapper,
invokeTimeout);
}
-
- public void onProviderErrorComponent(CAPDialog capDialog, Long invokeId,
CAPComponentErrorReason providerError) {
- CAPDialogWrapper capDialogWrapper = (CAPDialogWrapper)
capDialog.getUserObject();
- ProviderErrorComponent providerErrorComponent = new
ProviderErrorComponent(capDialogWrapper, invokeId,
- providerError);
- onEvent(providerErrorComponent.getEventTypeName(), capDialogWrapper,
providerErrorComponent);
- }
public void onCAPMessage(CAPMessage capMessage) {
// TODO Auto-generated method stub
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Sat Jan 5 01:57:11 2013
@@ -180,6 +180,21 @@
public void setUserObject(Object arg0) {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public void processInvokeWithoutAnswer(Long invokeId) {
+ this.wrappedDialog.processInvokeWithoutAnswer(invokeId);
+ }
+
+ @Override
+ public void setLocalAddress(SccpAddress address) {
+ this.wrappedDialog.setLocalAddress(address);
+ }
+
+ @Override
+ public void setRemoteAddress(SccpAddress address) {
+ this.wrappedDialog.setRemoteAddress(address);
+ }
public CAPDialogActivityHandle getActivityHandle() {
return activityHandle;
=======================================
---
/resources/cap/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Sat Jan 5 01:57:11 2013
@@ -256,12 +256,6 @@
<event-type-version>1.0</event-type-version>
</event-type-ref>
- <event-type-ref>
-
<event-type-name>ss7.cap.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-type-ref>
<event-type-name>ss7.cap.REJECT_COMPONENT</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
=======================================
---
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/DialogReject.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/DialogReject.java
Sat Jan 5 01:57:11 2013
@@ -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, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -20,13 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-/**
- *
- */
package org.mobicents.slee.resource.map.events;
import org.mobicents.protocols.ss7.map.api.MAPDialog;
-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.primitives.MAPExtensionContainer;
import org.mobicents.protocols.ss7.tcap.asn.ApplicationContextName;
@@ -40,19 +36,16 @@
private static final String EVENT_TYPE_NAME = "ss7.map.DIALOG_REJECT";
private final MAPRefuseReason refuseReason;
- private final MAPProviderError providerError;
private final ApplicationContextName alternativeApplicationContext;
private final MAPExtensionContainer extensionContainer;
/**
* @param mapDialogWrapper
*/
- public DialogReject(MAPDialog mapDialogWrapper, MAPRefuseReason
refuseReason,
- MAPProviderError providerError, ApplicationContextName
alternativeApplicationContext,
+ public DialogReject(MAPDialog mapDialogWrapper, MAPRefuseReason
refuseReason, ApplicationContextName alternativeApplicationContext,
MAPExtensionContainer extensionContainer) {
super(mapDialogWrapper, EVENT_TYPE_NAME, null);
this.refuseReason = refuseReason;
- this.providerError = providerError;
this.alternativeApplicationContext =
alternativeApplicationContext;
this.extensionContainer = extensionContainer;
}
@@ -60,10 +53,6 @@
public MAPRefuseReason getRefuseReason() {
return refuseReason;
}
-
- public MAPProviderError getProviderError() {
- return providerError;
- }
public ApplicationContextName getAlternativeApplicationContext() {
return alternativeApplicationContext;
@@ -75,8 +64,7 @@
@Override
public String toString() {
- return "DialogReject [refuseReason=" + refuseReason + ", providerError="
+ providerError
- + ", alternativeApplicationContext=" + alternativeApplicationContext
+ ", extensionContainer="
+ return "DialogReject [refuseReason=" + refuseReason + ",
alternativeApplicationContext=" + alternativeApplicationContext + ",
extensionContainer="
+ extensionContainer + ", " + this.mapDialogWrapper +
"]";
}
=======================================
---
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/RejectComponent.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/events/src/main/java/org/mobicents/slee/resource/map/events/RejectComponent.java
Sat Jan 5 01:57:11 2013
@@ -1,19 +1,19 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
- *
+ *
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -34,23 +34,29 @@
private static final String EVENT_TYPE_NAME =
"ss7.map.REJECT_COMPONENT";
protected Problem problem;
+ protected boolean isLocalOriginated;
/**
* @param mapDialogWrapper
* @param invokeId
*/
- public RejectComponent(MAPDialog mAPDialog, Long invokeId, Problem
problem) {
+ public RejectComponent(MAPDialog mAPDialog, Long invokeId, Problem
problem, boolean isLocalOriginated) {
super(mAPDialog, invokeId, EVENT_TYPE_NAME);
this.problem = problem;
+ this.isLocalOriginated = isLocalOriginated;
}
public Problem getProblem() {
return this.problem;
}
+
+ public boolean getIsLocalOriginated() {
+ return this.isLocalOriginated;
+ }
@Override
public String toString() {
- return "RejectComponent [problem=" + problem + ", invokeId=" + invokeId
+ ", mapDialogWrapper="
- + mapDialogWrapper + "]";
+ return "RejectComponent [problem=" + problem + ", invokeId=" + invokeId
+ ", capDialogWrapper=" + mapDialogWrapper
+ + (this.isLocalOriginated ? ", localOriginated" : ", remoteOriginated")
+ "]";
}
}
=======================================
--- /resources/map/events/src/main/resources/META-INF/event-jar.xml Mon Nov
19 01:31:31 2012
+++ /resources/map/events/src/main/resources/META-INF/event-jar.xml Sat
Jan 5 01:57:11 2013
@@ -399,13 +399,6 @@
<event-class-name>org.mobicents.slee.resource.map.events.ErrorComponent</event-class-name>
</event-definition>
- <event-definition>
-
<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-class-name>org.mobicents.slee.resource.map.events.ProviderErrorComponent</event-class-name>
- </event-definition>
-
<event-definition>
<event-type-name>ss7.map.REJECT_COMPONENT</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Sat Jan 5 01:57:11 2013
@@ -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, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -55,7 +55,6 @@
import org.mobicents.protocols.ss7.map.api.dialog.MAPAbortSource;
import org.mobicents.protocols.ss7.map.api.dialog.MAPDialogState;
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.MAPErrorMessage;
@@ -132,7 +131,6 @@
import org.mobicents.slee.resource.map.events.ErrorComponent;
import org.mobicents.slee.resource.map.events.InvokeTimeout;
import org.mobicents.slee.resource.map.events.MAPEvent;
-import org.mobicents.slee.resource.map.events.ProviderErrorComponent;
import org.mobicents.slee.resource.map.events.RejectComponent;
import
org.mobicents.slee.resource.map.service.callhandling.wrappers.MAPDialogCallHandlingWrapper;
import
org.mobicents.slee.resource.map.service.callhandling.wrappers.ProvideRoamingNumberRequestWrapper;
@@ -641,11 +639,10 @@
/**
* {@inheritDoc}
*/
- public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason
refuseReason, MAPProviderError providerError,
- ApplicationContextName alternativeApplicationContext,
MAPExtensionContainer extensionContainer) {
+ public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason
refuseReason, ApplicationContextName alternativeApplicationContext,
+ MAPExtensionContainer extensionContainer) {
MAPDialogWrapper mapDialogWrapper = (MAPDialogWrapper)
mapDialog.getUserObject();
- DialogReject dialogReject = new DialogReject(mapDialogWrapper,
refuseReason, providerError,
- alternativeApplicationContext,
extensionContainer);
+ DialogReject dialogReject = new DialogReject(mapDialogWrapper,
refuseReason, alternativeApplicationContext, extensionContainer);
MAPDialogActivityHandle handle =
onEvent(dialogReject.getEventTypeName(), mapDialogWrapper, dialogReject);
// End Activity
@@ -794,19 +791,9 @@
/**
* {@inheritDoc}
*/
- public void onProviderErrorComponent(MAPDialog mapDialog, Long invokeId,
MAPProviderError mapProviderError) {
+ public void onRejectComponent(MAPDialog mapDialog, Long invokeId, Problem
problem, boolean isLocalOriginated) {
MAPDialogWrapper mapDialogWrapper = (MAPDialogWrapper)
mapDialog.getUserObject();
- ProviderErrorComponent providerErrorComponent = new
ProviderErrorComponent(mapDialogWrapper, invokeId,
- mapProviderError);
- onEvent(providerErrorComponent.getEventTypeName(), mapDialogWrapper,
providerErrorComponent);
- }
-
- /**
- * {@inheritDoc}
- */
- public void onRejectComponent(MAPDialog mapDialog, Long invokeId, Problem
problem) {
- MAPDialogWrapper mapDialogWrapper = (MAPDialogWrapper)
mapDialog.getUserObject();
- RejectComponent rejectComponent = new RejectComponent(mapDialogWrapper,
invokeId, problem);
+ RejectComponent rejectComponent = new RejectComponent(mapDialogWrapper,
invokeId, problem, isLocalOriginated);
onEvent(rejectComponent.getEventTypeName(), mapDialogWrapper,
rejectComponent);
}
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPDialogCallHandlingWrapper.java
Tue Sep 11 00:17:33 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPDialogCallHandlingWrapper.java
Sat Jan 5 01:57:11 2013
@@ -74,68 +74,6 @@
public MAPDialogCallHandling getWrappedDialog() {
return this.wrappedDialog;
}
-
- @Override
- public Long addSendRoutingInformationRequest(long mapProtocolVersion,
ISDNAddressString msisdn, CUGCheckInfo cugCheckInfo, Integer
numberOfForwarding,
- InterrogationType interrogationType, boolean orInterrogation, Integer
orCapability, ISDNAddressString gmscAddress,
- CallReferenceNumber callReferenceNumber, ForwardingReason
forwardingReason, ExtBasicServiceCode basicServiceGroup,
- ExternalSignalInfo networkSignalInfo, CamelInfo camelInfo, boolean
suppressionOfAnnouncement, MAPExtensionContainer extensionContainer,
- AlertingPattern alertingPattern, boolean ccbsCall, Integer
supportedCCBSPhase, ExtExternalSignalInfo additionalSignalInfo,
- ISTSupportIndicator istSupportIndicator, boolean prePagingSupported,
CallDiversionTreatmentIndicator callDiversionTreatmentIndicator,
- boolean longFTNSupported, boolean suppressVtCSI, boolean
suppressIncomingCallBarring, boolean gsmSCFInitiatedCall,
- ExtBasicServiceCode basicServiceGroup2, ExternalSignalInfo
networkSignalInfo2, SuppressMTSS supressMTSS, boolean
mtRoamingRetrySupported,
- EMLPPPriority callPriority) throws MAPException {
- return
this.wrappedDialog.addSendRoutingInformationRequest(mapProtocolVersion,
msisdn, cugCheckInfo, numberOfForwarding, interrogationType,
- orInterrogation, orCapability, gmscAddress, callReferenceNumber,
forwardingReason, basicServiceGroup, networkSignalInfo, camelInfo,
- suppressionOfAnnouncement, extensionContainer, alertingPattern,
ccbsCall, supportedCCBSPhase, additionalSignalInfo, istSupportIndicator,
- prePagingSupported, callDiversionTreatmentIndicator, longFTNSupported,
suppressVtCSI, suppressIncomingCallBarring, gsmSCFInitiatedCall,
- basicServiceGroup2, networkSignalInfo2, supressMTSS,
mtRoamingRetrySupported, callPriority);
- }
-
- @Override
- public Long addSendRoutingInformationRequest(int customInvokeTimeout,
long mapProtocolVersion, ISDNAddressString msisdn, CUGCheckInfo
cugCheckInfo,
- Integer numberOfForwarding, InterrogationType interrogationType,
boolean orInterrogation, Integer orCapability, ISDNAddressString
gmscAddress,
- CallReferenceNumber callReferenceNumber, ForwardingReason
forwardingReason, ExtBasicServiceCode basicServiceGroup,
- ExternalSignalInfo networkSignalInfo, CamelInfo camelInfo, boolean
suppressionOfAnnouncement, MAPExtensionContainer extensionContainer,
- AlertingPattern alertingPattern, boolean ccbsCall, Integer
supportedCCBSPhase, ExtExternalSignalInfo additionalSignalInfo,
- ISTSupportIndicator istSupportIndicator, boolean prePagingSupported,
CallDiversionTreatmentIndicator callDiversionTreatmentIndicator,
- boolean longFTNSupported, boolean suppressVtCSI, boolean
suppressIncomingCallBarring, boolean gsmSCFInitiatedCall,
- ExtBasicServiceCode basicServiceGroup2, ExternalSignalInfo
networkSignalInfo2, SuppressMTSS supressMTSS, boolean
mtRoamingRetrySupported,
- EMLPPPriority callPriority) throws MAPException {
- return
this.wrappedDialog.addSendRoutingInformationRequest(customInvokeTimeout,
mapProtocolVersion, msisdn, cugCheckInfo, numberOfForwarding,
- interrogationType, orInterrogation, orCapability, gmscAddress,
callReferenceNumber, forwardingReason, basicServiceGroup, networkSignalInfo,
- camelInfo, suppressionOfAnnouncement, extensionContainer,
alertingPattern, ccbsCall, supportedCCBSPhase, additionalSignalInfo,
- istSupportIndicator, prePagingSupported,
callDiversionTreatmentIndicator, longFTNSupported, suppressVtCSI,
suppressIncomingCallBarring,
- gsmSCFInitiatedCall, basicServiceGroup2, networkSignalInfo2,
supressMTSS, mtRoamingRetrySupported, callPriority);
- }
-
- @Override
- public void addSendRoutingInformationResponse(long invokeId, long
mapProtocolVersion, IMSI imsi, ExtendedRoutingInfo extRoutingInfo,
- CUGCheckInfo cugCheckInfo, boolean cugSubscriptionFlag, SubscriberInfo
subscriberInfo, ArrayList<SSCode> ssList, ExtBasicServiceCode basicService,
- boolean forwardingInterrogationRequired, ISDNAddressString vmscAddress,
MAPExtensionContainer extensionContainer, NAEAPreferredCI naeaPreferredCI,
- CCBSIndicators ccbsIndicators, ISDNAddressString msisdn,
NumberPortabilityStatus nrPortabilityStatus, Integer istAlertTimer,
- SupportedCamelPhases supportedCamelPhases, OfferedCamel4CSIs
offeredCamel4CSIs, RoutingInfo routingInfo2, ArrayList<SSCode> ssList2,
- ExtBasicServiceCode basicService2, AllowedServices allowedServices,
UnavailabilityCause unavailabilityCause, boolean releaseResourcesSupported,
- ExternalSignalInfo gsmBearerCapability) throws
MAPException {
- this.wrappedDialog.addSendRoutingInformationResponse(invokeId,
mapProtocolVersion, imsi, extRoutingInfo, cugCheckInfo, cugSubscriptionFlag,
- subscriberInfo, ssList, basicService, forwardingInterrogationRequired,
vmscAddress, extensionContainer, naeaPreferredCI, ccbsIndicators,
- msisdn, nrPortabilityStatus, istAlertTimer, supportedCamelPhases,
offeredCamel4CSIs, routingInfo2, ssList2, basicService2, allowedServices,
- unavailabilityCause, releaseResourcesSupported,
gsmBearerCapability);
- }
-
- @Override
- public Long addProvideRoamingNumberRequest(IMSI imsi, ISDNAddressString
mscNumber, ISDNAddressString msisdn, LMSI lmsi,
- ExternalSignalInfo gsmBearerCapability, ExternalSignalInfo
networkSignalInfo, boolean suppressionOfAnnouncement, ISDNAddressString
gmscAddress,
- CallReferenceNumber callReferenceNumber, boolean orInterrogation,
MAPExtensionContainer extensionContainer, AlertingPattern alertingPattern,
- boolean ccbsCall, SupportedCamelPhases
supportedCamelPhasesInInterrogatingNode, ExtExternalSignalInfo
additionalSignalInfo,
- boolean orNotSupportedInGMSC, boolean prePagingSupported, boolean
longFTNSupported, boolean suppressVtCsi,
- OfferedCamel4CSIs offeredCamel4CSIsInInterrogatingNode, boolean
mtRoamingRetrySupported, PagingArea pagingArea, EMLPPPriority callPriority,
- boolean mtrfIndicator, ISDNAddressString oldMSCNumber) throws
MAPException {
- return this.wrappedDialog.addProvideRoamingNumberRequest(imsi,
mscNumber, msisdn, lmsi, gsmBearerCapability, networkSignalInfo,
- suppressionOfAnnouncement, gmscAddress, callReferenceNumber,
orInterrogation, extensionContainer, alertingPattern, ccbsCall,
- supportedCamelPhasesInInterrogatingNode, additionalSignalInfo,
orNotSupportedInGMSC, prePagingSupported, longFTNSupported, suppressVtCsi,
- offeredCamel4CSIsInInterrogatingNode, mtRoamingRetrySupported,
pagingArea, callPriority, mtrfIndicator, oldMSCNumber);
- }
@Override
public Long addProvideRoamingNumberRequest(int customInvokeTimeout, IMSI
imsi, ISDNAddressString mscNumber, ISDNAddressString msisdn, LMSI lmsi,
@@ -156,5 +94,61 @@
boolean releaseResourcesSupported, ISDNAddressString vmscAddress)
throws MAPException {
this.wrappedDialog.addProvideRoamingNumberResponse(invokeId,
roamingNumber, extensionContainer, releaseResourcesSupported, vmscAddress);
}
+
+ @Override
+ public Long addProvideRoamingNumberRequest(IMSI arg0, ISDNAddressString
arg1, ISDNAddressString arg2, LMSI arg3, ExternalSignalInfo arg4,
+ ExternalSignalInfo arg5, boolean arg6, ISDNAddressString arg7,
CallReferenceNumber arg8, boolean arg9, MAPExtensionContainer arg10,
+ AlertingPattern arg11, boolean arg12, SupportedCamelPhases arg13,
ExtExternalSignalInfo arg14, boolean arg15, boolean arg16, boolean arg17,
+ boolean arg18, OfferedCamel4CSIs arg19, boolean arg20, PagingArea
arg21, EMLPPPriority arg22, boolean arg23, ISDNAddressString arg24)
+ throws MAPException {
+ return this.wrappedDialog.addProvideRoamingNumberRequest(arg0, arg1,
arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13,
arg14,
+ arg15, arg16, arg17, arg18, arg19, arg20,
arg21, arg22, arg23, arg24);
+ }
+
+ @Override
+ public Long addSendRoutingInformationRequest(ISDNAddressString arg0,
CUGCheckInfo arg1, Integer arg2, ExternalSignalInfo arg3) throws
MAPException {
+ return this.wrappedDialog.addSendRoutingInformationRequest(arg0, arg1,
arg2, arg3);
+ }
+
+ @Override
+ public Long addSendRoutingInformationRequest(int arg0, ISDNAddressString
arg1, CUGCheckInfo arg2, Integer arg3, ExternalSignalInfo arg4)
+ throws MAPException {
+ return this.wrappedDialog.addSendRoutingInformationRequest(arg0, arg1,
arg2, arg3, arg4);
+ }
+
+ @Override
+ public Long addSendRoutingInformationRequest(ISDNAddressString arg0,
CUGCheckInfo arg1, Integer arg2, InterrogationType arg3, boolean arg4,
Integer arg5,
+ ISDNAddressString arg6, CallReferenceNumber arg7, ForwardingReason
arg8, ExtBasicServiceCode arg9, ExternalSignalInfo arg10, CamelInfo arg11,
+ boolean arg12, MAPExtensionContainer arg13, AlertingPattern arg14,
boolean arg15, Integer arg16, ExtExternalSignalInfo arg17,
+ ISTSupportIndicator arg18, boolean arg19,
CallDiversionTreatmentIndicator arg20, boolean arg21, boolean arg22,
boolean arg23, boolean arg24,
+ ExtBasicServiceCode arg25, ExternalSignalInfo arg26, SuppressMTSS
arg27, boolean arg28, EMLPPPriority arg29) throws MAPException {
+ return this.wrappedDialog.addSendRoutingInformationRequest(arg0, arg1,
arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13,
+ arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21, arg22, arg23,
arg24, arg25, arg26, arg27, arg28, arg29);
+ }
+
+ @Override
+ public Long addSendRoutingInformationRequest(int arg0, ISDNAddressString
arg1, CUGCheckInfo arg2, Integer arg3, InterrogationType arg4, boolean arg5,
+ Integer arg6, ISDNAddressString arg7, CallReferenceNumber arg8,
ForwardingReason arg9, ExtBasicServiceCode arg10, ExternalSignalInfo arg11,
+ CamelInfo arg12, boolean arg13, MAPExtensionContainer arg14,
AlertingPattern arg15, boolean arg16, Integer arg17, ExtExternalSignalInfo
arg18,
+ ISTSupportIndicator arg19, boolean arg20,
CallDiversionTreatmentIndicator arg21, boolean arg22, boolean arg23,
boolean arg24, boolean arg25,
+ ExtBasicServiceCode arg26, ExternalSignalInfo arg27, SuppressMTSS
arg28, boolean arg29, EMLPPPriority arg30) throws MAPException {
+ return this.wrappedDialog.addSendRoutingInformationRequest(arg0, arg1,
arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13,
+ arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21, arg22, arg23,
arg24, arg25, arg26, arg27, arg28, arg29, arg30);
+ }
+
+ @Override
+ public void addSendRoutingInformationResponse(long arg0, IMSI arg1,
CUGCheckInfo arg2, RoutingInfo arg3) throws MAPException {
+ this.wrappedDialog.addSendRoutingInformationResponse(arg0, arg1, arg2,
arg3);
+ }
+
+ @Override
+ public void addSendRoutingInformationResponse(long arg0, IMSI arg1,
ExtendedRoutingInfo arg2, CUGCheckInfo arg3, boolean arg4, SubscriberInfo
arg5,
+ ArrayList<SSCode> arg6, ExtBasicServiceCode arg7, boolean arg8,
ISDNAddressString arg9, MAPExtensionContainer arg10, NAEAPreferredCI arg11,
+ CCBSIndicators arg12, ISDNAddressString arg13, NumberPortabilityStatus
arg14, Integer arg15, SupportedCamelPhases arg16, OfferedCamel4CSIs arg17,
+ RoutingInfo arg18, ArrayList<SSCode> arg19, ExtBasicServiceCode arg20,
AllowedServices arg21, UnavailabilityCause arg22, boolean arg23,
+ ExternalSignalInfo arg24) throws MAPException {
+ this.wrappedDialog.addSendRoutingInformationResponse(arg0, arg1, arg2,
arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14,
+ arg15, arg16, arg17, arg18, arg19, arg20,
arg21, arg22, arg23, arg24);
+ }
}
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Sat Jan 5 01:57:11 2013
@@ -1,3 +1,25 @@
+/*
+ * 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.slee.resource.map.wrappers;
import org.mobicents.protocols.ss7.map.api.MAPApplicationContext;
@@ -192,6 +214,20 @@
public boolean getReturnMessageOnError(){
return this.wrappedDialog.getReturnMessageOnError();
}
+
+ public void processInvokeWithoutAnswer(Long invokeId) {
+ this.wrappedDialog.processInvokeWithoutAnswer(invokeId);
+ }
+
+ @Override
+ public void setLocalAddress(SccpAddress address) {
+ this.wrappedDialog.setLocalAddress(address);
+ }
+
+ @Override
+ public void setRemoteAddress(SccpAddress address) {
+ this.wrappedDialog.setRemoteAddress(address);
+ }
public MAPDialogActivityHandle getActivityHandle() {
return activityHandle;
=======================================
---
/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Mon Nov 19 01:31:31 2012
+++
/resources/map/ratype/src/main/resources/META-INF/resource-adaptor-type-jar.xml
Sat Jan 5 01:57:11 2013
@@ -380,12 +380,6 @@
<event-type-version>1.0</event-type-version>
</event-type-ref>
- <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-type-ref>
<event-type-name>ss7.map.REJECT_COMPONENT</event-type-name>
<event-type-vendor>org.mobicents</event-type-vendor>
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
Sat Jan 5 01:57:11 2013
@@ -510,14 +510,16 @@
this.tracer.severe(String.format("Exception when trying to fire event
DIALOG_UNI for received TCUniIndication=%s ", tcUniIndication), e);
} finally {
// End Activity
- if (activityHandle != null) {
- try {
-
this.sleeEndpoint.endActivity(activityHandle);
- } catch (Exception e) {
- this.tracer.severe(String.format("Exception while trying to end the
Activity for Dialog=%s for received TCUniIndication=%s", wrappedDialog,
- tcUniIndication));
- }
- }
+
+ // we do not end activity here because we do it by TCAP
stack
+// if (activityHandle != null) {
+// try {
+//
this.sleeEndpoint.endActivity(activityHandle);
+// } catch (Exception e) {
+// this.tracer.severe(String.format("Exception while trying to end the
Activity for Dialog=%s for received TCUniIndication=%s", wrappedDialog,
+// tcUniIndication));
+// }
+// }
}
}
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ComponentEventImpl.java
Sat Sep 1 02:07:21 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ComponentEventImpl.java
Sat Jan 5 01:57:11 2013
@@ -1,8 +1,31 @@
+/*
+ * 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.slee.resource.tcap.wrappers;
import org.mobicents.protocols.asn.AsnInputStream;
import org.mobicents.protocols.asn.AsnOutputStream;
import org.mobicents.protocols.ss7.tcap.api.tc.dialog.Dialog;
+import org.mobicents.protocols.ss7.tcap.asn.EncodeException;
import org.mobicents.protocols.ss7.tcap.asn.ParseException;
import org.mobicents.protocols.ss7.tcap.asn.comp.Component;
import org.mobicents.protocols.ss7.tcap.asn.comp.ComponentType;
@@ -48,7 +71,7 @@
* .asn.AsnOutputStream)
*/
@Override
- public void encode(AsnOutputStream arg0) throws ParseException {
+ public void encode(AsnOutputStream arg0) throws EncodeException {
throw new UnsupportedOperationException("Unsupported
Operation");
}
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ProviderAbortEventImpl.java
Wed Dec 5 04:31:03 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/ProviderAbortEventImpl.java
Sat Jan 5 01:57:11 2013
@@ -41,10 +41,5 @@
public PAbortCauseType getPAbortCause() {
return this.wrappedComponent.getPAbortCause();
}
-
- @Override
- public boolean isLocalProviderOriginated() {
- return this.wrappedComponent.isLocalProviderOriginated();
- }
}
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/RejectEventImpl.java
Sat Sep 1 02:07:21 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/RejectEventImpl.java
Sat Jan 5 01:57:11 2013
@@ -1,24 +1,25 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and/or its affiliates, and individual
- * contributors as indicated by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a full listing
- * of individual contributors.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License, v. 2.0.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License,
- * v. 2.0 along with this distribution; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
+
package org.mobicents.slee.resource.tcap.wrappers;
import org.mobicents.protocols.ss7.tcap.asn.comp.Problem;
@@ -59,5 +60,15 @@
public void setProblem(Problem problem) {
this.wrappedComponent.setProblem(problem);
}
+
+ @Override
+ public boolean isLocalOriginated() {
+ return this.wrappedComponent.isLocalOriginated();
+ }
+
+ @Override
+ public void setLocalOriginated(boolean val) {
+ this.wrappedComponent.setLocalOriginated(val);
+ }
}
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
Sat Jan 5 01:57:11 2013
@@ -1,3 +1,25 @@
+/*
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
package org.mobicents.slee.resource.tcap.wrappers;
import org.mobicents.protocols.ss7.sccp.parameter.SccpAddress;
@@ -128,7 +150,27 @@
public Long getRemoteDialogId() {
return this.wrappedDialog.getRemoteDialogId();
}
-
+
+ @Override
+ public boolean getPreviewMode() {
+ return this.wrappedDialog.getPreviewMode();
+ }
+
+ @Override
+ public void processInvokeWithoutAnswer(Long invokeId) {
+ this.wrappedDialog.processInvokeWithoutAnswer(invokeId);
+ }
+
+ @Override
+ public void setLocalAddress(SccpAddress address) {
+ this.wrappedDialog.setLocalAddress(address);
+ }
+
+ @Override
+ public void setRemoteAddress(SccpAddress address) {
+ this.wrappedDialog.setRemoteAddress(address);
+ }
+
/*
* (non-Javadoc)
*
@@ -376,10 +418,5 @@
public TCAPResourceAdaptor getRa() {
return ra;
}
-
- @Override
- public boolean getPreviewMode() {
- return this.wrappedDialog.getPreviewMode();
- }
}
