Revision: 15552
Author: [email protected]
Date: Mon Nov 29 12:25:49 2010
Log: Refactoring on the application data replication, now a dedicated
attribute instead of a replication strategy.
http://code.google.com/p/mobicents/source/detail?r=15552
Modified:
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/ConfirmedReplicationSipDialog.java
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ReplicationStrategy.java
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/ConfirmedReplicationSipDialog.java
Fri May 14 18:55:28 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/ConfirmedReplicationSipDialog.java
Mon Nov 29 12:25:49 2010
@@ -21,6 +21,8 @@
*/
package gov.nist.javax.sip.stack;
+import org.mobicents.ha.javax.sip.ClusteredSipStack;
+
import gov.nist.javax.sip.SipProviderImpl;
import gov.nist.javax.sip.message.SIPResponse;
@@ -49,10 +51,20 @@
@Override
public void setApplicationData(Object applicationData) {
super.setApplicationData(applicationData);
- replicateState();
+
if(((ClusteredSipStack)getStack()).isReplicateApplicationData()) {
+ replicateState();
+ }
}
public Object getApplicationDataToReplicate() {
- return getApplicationData();
+
if(((ClusteredSipStack)getStack()).isReplicateApplicationData()) {
+ return getApplicationData();
+ }
+ return null;
+ }
+
+ @Override
+ public void setApplicationDataToReplicate(Object appData) {
+ super.setApplicationData(appData);
}
}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Mon Nov 29 08:28:57 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Mon Nov 29 12:25:49 2010
@@ -57,17 +57,6 @@
MessageChannel newChannelToUse) {
super(sipStack, newChannelToUse);
}
-
- @Override
- protected void map() {
- super.map();
-// // store the tx when the transaction is mapped
-// try {
-//
((ClusteredSipStack)sipStack).getSipCache().putServerTransaction(this);
-// } catch (SipCacheException e) {
-// sipStack.getStackLogger().logError("problem storing server
transaction " + transactionId + " into the distributed cache", e);
-// }
- }
public Map<String, Object> getMetaDataToReplicate() {
Map<String,Object> transactionMetaData = new
HashMap<String,Object>();
@@ -130,10 +119,6 @@
}
super.sendResponse(response);
}
-
- public Object getApplicationDataToReplicate() {
- return null;
- }
public void setMetaDataToReplicate(Map<String, Object>
transactionMetaData,
boolean recreation) throws PeerUnavailableException,
ParseException {
@@ -162,7 +147,26 @@
}
}
- public void setApplicationDataToReplicate(Object transactionAppData) {
-
+ @Override
+ public void setApplicationData(Object applicationData) {
+ super.setApplicationData(applicationData);
+
if(((ClusteredSipStack)getSIPStack()).isReplicateApplicationData()) {
+ try {
+
((ClusteredSipStack)getSIPStack()).getSipCache().putServerTransaction(this);
+ } catch (SipCacheException e) {
+ getSIPStack().getStackLogger().logError("problem storing server
transaction " + transactionId + " into the distributed cache", e);
+ }
+ }
+ }
+
+ public Object getApplicationDataToReplicate() {
+
if(((ClusteredSipStack)getSIPStack()).isReplicateApplicationData()) {
+ return getApplicationData();
+ }
+ return null;
+ }
+
+ public void setApplicationDataToReplicate(Object appData) {
+ super.setApplicationData(appData);
}
}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Fri Nov 26 13:41:33 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Mon Nov 29 12:25:49 2010
@@ -43,6 +43,7 @@
public interface ClusteredSipStack extends SipStack {
public static final String CACHE_CLASS_NAME_PROPERTY
= "org.mobicents.ha.javax.sip.CACHE_CLASS_NAME";
public static final String REPLICATION_STRATEGY_PROPERTY
= "org.mobicents.ha.javax.sip.REPLICATION_STRATEGY";
+ public static final String REPLICATE_APPLICATION_DATA
= "org.mobicents.ha.javax.sip.REPLICATE_APPLICATION_DATA";
SIPDialog getDialog(String dialogId);
void putDialog(SIPDialog dialog);
@@ -53,7 +54,6 @@
* @param sipCache the sipCache to set
*/
void setSipCache(SipCache sipCache);
-
/**
* @return the sipCache
*/
@@ -82,4 +82,6 @@
MessageProcessor[] getStackMessageProcessors();
SIPTransaction findTransaction(String transactionId, boolean isServer);
-}
+
+ boolean isReplicateApplicationData();
+}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Fri Nov 26 13:41:33 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Mon Nov 29 12:25:49 2010
@@ -73,7 +73,8 @@
protected LoadBalancerElector loadBalancerElector = null;
protected TransactionFactory transactionFactory = null;
protected SipProviderFactory sipProviderFactory = null;
- private boolean sendTryingRightAway;
+ protected boolean sendTryingRightAway;
+ private boolean replicateApplicationData = false;
public ClusteredSipStackImpl(Properties configurationProperties) throws
PeerUnavailableException {
@@ -155,6 +156,14 @@
transactionFactory.setSipStack(this);
}
}
+ String replicateApplicationDataProperty =
configurationProperties.getProperty(ClusteredSipStack.REPLICATE_APPLICATION_DATA);
+ if(replicateApplicationDataProperty != null) {
+ replicateApplicationData =
Boolean.valueOf(replicateApplicationDataProperty);
+ }
+ // backward compatible hack to make sure old applications still
replicate the app data if they don't use the new property
+ if(replicateApplicationDataProperty == null && replicationStrategy ==
ReplicationStrategy.ConfirmedDialog) {
+ replicateApplicationData = true;
+ }
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_INFO)) {
getStackLogger().logInfo("Replication Strategy is " +
replicationStrategy);
}
@@ -535,5 +544,12 @@
public void removeSipProvider(SipProviderImpl sipProvider) {
sipProviders.remove(sipProvider);
+ }
+
+ /**
+ * @return the replicateApplicationData
+ */
+ public boolean isReplicateApplicationData() {
+ return replicateApplicationData;
}
}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ReplicationStrategy.java
Wed Oct 28 10:07:49 2009
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ReplicationStrategy.java
Mon Nov 29 12:25:49 2010
@@ -26,5 +26,9 @@
*
*/
public enum ReplicationStrategy {
- ConfirmedDialog, ConfirmedDialogNoApplicationData, EarlyDialog,
Transaction
-}
+ ConfirmedDialog,
+ @Deprecated
+ ConfirmedDialogNoApplicationData,
+ EarlyDialog,
+ Transaction
+}