Author: ruwan
Date: Wed May 7 16:59:09 2008
New Revision: 16634
Log:
Fixing according to the synapse changes
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/EndpointAdmin.java
Wed May 7 16:59:09 2008
@@ -25,7 +25,6 @@
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.xml.SynapseXMLConfigurationFactory;
import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
import org.apache.synapse.config.xml.endpoints.EndpointFactory;
import org.apache.synapse.endpoints.*;
import org.apache.synapse.endpoints.dispatch.Dispatcher;
@@ -210,7 +209,8 @@
if (ep instanceof AddressEndpoint) {
EndpointDefinition def = ((AddressEndpoint) ep).getEndpoint();
AddressEndpointData epData = new AddressEndpointData();
- epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(
+ ((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
epData.setName(ep.getName());
epData.setEndpointDefinition(def);
return epData;
@@ -225,7 +225,8 @@
WSDLEndpoint wsdlEndpoint = (WSDLEndpoint) ep;
EndpointDefinition def = (wsdlEndpoint).getEndpoint();
WSDLEndpointData epData = new WSDLEndpointData();
-
epData.setSuspendDurationOnFailure(wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(
+ wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
epData.setName(wsdlEndpoint.getName());
epData.setPort(wsdlEndpoint.getPortName());
epData.setService(wsdlEndpoint.getServiceName());
@@ -279,7 +280,8 @@
EndpointDefinition def = ((AddressEndpoint)
ep).getEndpoint();
AddressEndpointData epData = new AddressEndpointData();
epData.setName(ep.getName());
- epData.setSuspendDurationOnFailure(((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(
+ ((AddressEndpoint)
ep).getEndpoint().getSuspendOnFailDuration());
epData.setEndpointDefinition(def);
datas[i] = epData;
}
@@ -293,7 +295,8 @@
WSDLEndpoint wsdlEndpoint = (WSDLEndpoint) ep;
EndpointDefinition def = (wsdlEndpoint).getEndpoint();
WSDLEndpointData epData = new WSDLEndpointData();
-
epData.setSuspendDurationOnFailure(wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
+ epData.setSuspendDurationOnFailure(
+ wsdlEndpoint.getEndpoint().getSuspendOnFailDuration());
epData.setName(wsdlEndpoint.getName());
epData.setPort(wsdlEndpoint.getPortName());
epData.setService(wsdlEndpoint.getServiceName());
@@ -337,16 +340,16 @@
}
public EndpointData convertToEndpointData(OMElement epElement) throws
AxisFault {
- EndpointFactory fac =
EndpointAbstractFactory.getEndpointFactory(epElement);
- if (fac != null) {
- Endpoint endpoint = fac.createEndpoint(epElement, true);
+
+ try {
+ Endpoint endpoint =
EndpointFactory.getEndpointFromElement(epElement, false);
if (endpoint != null) {
return getEndpointData(endpoint);
} else {
handleFault(log, "Unable to create an endpoint definition",
null);
}
- } else {
- handleFault(log, "Unable to access the endpoint factory instance",
null);
+ } catch (SynapseException e) {
+ handleFault(log, "Unable to access the endpoint factory instance",
e);
}
return null;
}
@@ -424,8 +427,7 @@
.getStatisticsState();
}
- Endpoint endpoint = EndpointAbstractFactory.getEndpointFactory(
- endpointElement).createEndpoint(endpointElement, false);
+ Endpoint endpoint =
EndpointFactory.getEndpointFromElement(endpointElement, false);
if (endpoint == null) {
handleFault(log, "Newly created endpoint is null ", null);
}
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
