You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2009/08/27 10:14:33 UTC
svn commit: r808316 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/endpoints/ core/ core/axis2/ endpoints/
Author: ruwan
Date: Thu Aug 27 08:14:33 2009
New Revision: 808316
URL: http://svn.apache.org/viewvc?rev=808316&view=rev
Log:
Applying the patch from Amila on SYNAPSE-568
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/LoadBalanceMembershipHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java?rev=808316&r1=808315&r2=808316&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointSerializer.java Thu Aug 27 08:14:33 2009
@@ -281,6 +281,8 @@
return new IndirectEndpointSerializer();
} else if (endpoint instanceof SALoadbalanceEndpoint) {
return new SALoadbalanceEndpointSerializer();
+ } else if (endpoint instanceof DynamicLoadbalanceEndpoint){
+ return new DynamicLoadbalanceEndpointSerializer();
} else if (endpoint instanceof LoadbalanceEndpoint) {
return new LoadbalanceEndpointSerializer();
} else if (endpoint instanceof FailoverEndpoint) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/LoadBalanceMembershipHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/LoadBalanceMembershipHandler.java?rev=808316&r1=808315&r2=808316&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/LoadBalanceMembershipHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/LoadBalanceMembershipHandler.java Thu Aug 27 08:14:33 2009
@@ -59,6 +59,21 @@
* @param context The AlgorithmContext which holds information needed for the algorithm
* @return Next application member to whom the message has to be sent to
*/
- Member getNextApplicationMember(AlgorithmContext context);
+ Member getNextApplicationMember(AlgorithmContext context);
+
+ /**
+ * Get the algorithum uses in this membership handler
+ *
+ * @return Load balance algorithm use for this Membership handler
+ */
+ LoadbalanceAlgorithm getLoadbalanceAlgorithm();
+
+ /**
+ * get the properties used to init this membership handler
+ *
+ * @return get the initial properties
+ */
+ Properties getProperties();
+
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java?rev=808316&r1=808315&r2=808316&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2LoadBalanceMembershipHandler.java Thu Aug 27 08:14:33 2009
@@ -41,8 +41,10 @@
private GroupManagementAgent groupMgtAgent;
private ConfigurationContext configCtx;
private LoadbalanceAlgorithm algorithm;
+ private Properties properties;
public void init(Properties props, LoadbalanceAlgorithm algorithm) {
+ this.properties = props;
this.lbDomain = props.getProperty("applicationDomain");
if(lbDomain == null){
String msg = "The applicationDomain property has not been specified in the " +
@@ -90,4 +92,12 @@
algorithm.setApplicationMembers(groupMgtAgent.getMembers());
return algorithm.getNextApplicationMember(context);
}
-}
\ No newline at end of file
+
+ public LoadbalanceAlgorithm getLoadbalanceAlgorithm() {
+ return this.algorithm;
+ }
+
+ public Properties getProperties() {
+ return this.properties;
+ }
+}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java?rev=808316&r1=808315&r2=808316&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/DynamicLoadbalanceEndpoint.java Thu Aug 27 08:14:33 2009
@@ -72,6 +72,10 @@
this.lbMembershipHandler = lbMembershipHandler;
}
+ public LoadBalanceMembershipHandler getLbMembershipHandler() {
+ return lbMembershipHandler;
+ }
+
public void send(MessageContext synCtx) {
EndpointReference to = synCtx.getTo();
DynamicLoadbalanceFaultHandler faultHandler = new DynamicLoadbalanceFaultHandler(to);