remove unused property

Author: knosach

docs/sources-asciidoc/src/main/asciidoc/concept-section-SS_Load_Balancer.adoc

@@ -76,7 +76,7 @@ in common section
 in external section
  <ipv6UdpPort>5070<ipv6UdpPort>
 
-Other tags you can see in example of lb-configuration.xml below. 
+Other tags you can see in example of lb-configuration.xml below.
 
 == HTTP Load Balancing Basics
 
@@ -309,8 +309,7 @@ http://docs.google.com/present/view?id=dc5jp5vx_89cxdvtxcm-->
   <isSend5xxResponse>true</isSend5xxResponse>
   <isSend5xxResponseReasonHeader>Destination not available</isSend5xxResponseReasonHeader>
   <isSend5xxResponseSatusCode>503</isSend5xxResponseSatusCode>
-  <responseStatusCodeNodeRemoval>503</responseStatusCodeNodeRemoval>
-  <responseReasonNodeRemoval>Unable to setup media services</responseReasonNodeRemoval>
+  <responsesStatusCodeNodeRemoval>503,504</responseStatusCodeNodeRemoval>
   <matchingHostnameForRoute>restcomm.com</matchingHostnameForRoute>
   <isFilterSubdomain>true</isFilterSubdomain>
   <algorithm>
@@ -536,9 +535,8 @@ isSend5xxResponseReasonHeader::
 isSend5xxResponseSatusCode::
   Code of error. You can manage it.
 
-responseStatusCodeNodeRemoval::
-responseReasonNodeRemoval::
-  if LB gets response from the node with this status code and reason more than three times,
+responsesStatusCodeNodeRemoval::
+  if LB gets response from the node with this status code more than three times,
   it removes this node from the node's map until the node will be restarted
 
 matchingHostnameForRoute::

jar/pom.xml

@@ -47,12 +47,6 @@
 			<artifactId>commons-beanutils</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>jgroups</groupId>
-			<artifactId>jgroups</artifactId>
-			<version>2.7.0.GA</version>
-		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -173,8 +167,8 @@
 		<dependency>
     		<groupId>org.infinispan</groupId>
     		<artifactId>infinispan-core</artifactId>
-    		<version>5.1.2.FINAL</version>
-		</dependency>
+    		<version>5.3.0.Final</version>
+		</dependency>		
 	</dependencies>
 
 	<build>

jar/src/main/java/org/mobicents/tools/configuration/SipConfiguration.java

@@ -22,7 +22,6 @@ public class SipConfiguration {
 	public static final String IS_SEND_5XX_RESPONSE_REASON_HEADER = null;
 	public static final Integer IS_SEND_5XX_RESPONSE_STATUS_CODE = 503;
 	public static final String RESPONSES_STATUS_CODE_NODE_REMOVAL = "503";
-	public static final String RESPONSES_REASON_NODE_REMOVAL = null;
 	public static final Boolean IS_USE_WITH_NEXMO = false;
 	public static final String MATCHING_HOSTNAME_FOR_ROUTE = null;
 	public static final Boolean IS_FILTER_SUBDOMAIN = false;
@@ -39,7 +38,6 @@ public class SipConfiguration {
 	private String isSend5xxResponseReasonHeader;
 	private Integer isSend5xxResponseSatusCode;
 	private List<Integer> responsesStatusCodeNodeRemoval;
-	private String responsesReasonNodeRemoval;
 	private Boolean isUseWithNexmo;
 	private String matchingHostnameForRoute;
 	private Boolean isFilterSubdomain;
@@ -62,7 +60,6 @@ public SipConfiguration()
         this.isSend5xxResponseReasonHeader = IS_SEND_5XX_RESPONSE_REASON_HEADER;
         this.isSend5xxResponseSatusCode = IS_SEND_5XX_RESPONSE_STATUS_CODE;
         this.responsesStatusCodeNodeRemoval = new ArrayList<Integer>();
-        this.responsesReasonNodeRemoval = RESPONSES_REASON_NODE_REMOVAL;
         this.isUseWithNexmo = IS_USE_WITH_NEXMO;
         this.matchingHostnameForRoute = MATCHING_HOSTNAME_FOR_ROUTE;
         this.isFilterSubdomain = IS_FILTER_SUBDOMAIN;
@@ -188,14 +185,6 @@ public void setResponseStatusCodeNodeRemoval(List<Integer> responsesStatusCodeNo
 		this.responsesStatusCodeNodeRemoval = responsesStatusCodeNodeRemoval;
 	}
 
-	public String getResponsesReasonNodeRemoval() {
-		return responsesReasonNodeRemoval;
-	}
-
-	public void setResponsesReasonNodeRemoval(String responsesReasonNodeRemoval) {
-		this.responsesReasonNodeRemoval = responsesReasonNodeRemoval;
-	}
-
 	public Boolean getIsUseWithNexmo() {
 		return isUseWithNexmo;
 	}

jar/src/main/java/org/mobicents/tools/configuration/XmlConfigurationLoader.java

@@ -104,7 +104,6 @@ private static void configureSip(HierarchicalConfiguration<ImmutableNode> src, S
 			}
         	dst.setResponseStatusCodeNodeRemoval(responsesStatusCodeNodeRemovalList);
         }
-        dst.setResponsesReasonNodeRemoval(src.getString("responsesReasonNodeRemoval", SipConfiguration.RESPONSES_REASON_NODE_REMOVAL));
         dst.setIsUseWithNexmo(src.getBoolean("isUseWithNexmo",SipConfiguration.IS_USE_WITH_NEXMO));
         dst.setMatchingHostnameForRoute(src.getString("matchingHostnameForRoute", SipConfiguration.MATCHING_HOSTNAME_FOR_ROUTE));
         dst.setIsFilterSubdomain(src.getBoolean("isFilterSubdomain", SipConfiguration.IS_FILTER_SUBDOMAIN));

jar/src/main/java/org/mobicents/tools/sip/balancer/SIPBalancerForwarder.java

@@ -160,7 +160,6 @@ public void start() {
     		balancerRunner.balancerContext.sipHeaderAffinityKeyExclusionPattern = Pattern.compile(balancerRunner.balancerContext.lbConfig.getSipConfiguration().getAlgorithmConfiguration().getSipHeaderAffinityKeyExclusionPattern());
     	}
     	balancerRunner.balancerContext.isUseWithNexmo = balancerRunner.balancerContext.lbConfig.getSipConfiguration().getIsUseWithNexmo();
-    	balancerRunner.balancerContext.responsesReasonNodeRemoval = balancerRunner.balancerContext.lbConfig.getSipConfiguration().getResponsesReasonNodeRemoval();
     	balancerRunner.balancerContext.responsesStatusCodeNodeRemoval = balancerRunner.balancerContext.lbConfig.getSipConfiguration().getResponsesStatusCodeNodeRemoval();
     	balancerRunner.balancerContext.matchingHostnameForRoute = balancerRunner.balancerContext.lbConfig.getSipConfiguration().getMatchingHostnameForRoute();
     	balancerRunner.balancerContext.isFilterSubdomain = balancerRunner.balancerContext.lbConfig.getSipConfiguration().getIsFilterSubdomain();
@@ -3117,7 +3116,6 @@ private void mediaFailureDetection(Response response, InvocationContext ctx, SIP
     	Boolean isIpV6=InetAddressValidator.getInstance().isValidInet6Address(node.getIp());        	        
     	KeySip keySip = new KeySip(node);
     	if(balancerRunner.balancerContext.responsesStatusCodeNodeRemoval.contains(response.getStatusCode())) 
-//    			&& response.getReasonPhrase().equals(balancerRunner.balancerContext.responsesReasonNodeRemoval))
     		if(ctx.sipNodeMap(isIpV6).get(keySip).getAndIncrementFailCounter()>2) {
 					logger.error("mediaFailureDetection on keysip " + keySip + ", removing node " + node);
 					ctx.sipNodeMap(isIpV6).remove(keySip);