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 2008/06/22 14:49:59 UTC
svn commit: r670352 -
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/
Author: ruwan
Date: Sun Jun 22 05:49:59 2008
New Revision: 670352
URL: http://svn.apache.org/viewvc?rev=670352&view=rev
Log:
Reformatting Endpoint config factory and serializer classes
No functional changes
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
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/config/xml/endpoints/FailoverEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -35,7 +35,8 @@
* Configuration syntax:
* <pre>
* <endpoint [name="<em>name</em>"]>
- * <address uri="<em>endpoint address</em>" [format="soap11|soap12|pox|get"] [optimize="mtom|swa"]
+ * <address uri="<em>endpoint address</em>" [format="soap11|soap12|pox|get"]
+ * [optimize="mtom|swa"]
* [encoding="<em>charset encoding</em>"]
* [statistics="enable|disable"] [trace="enable|disable"]>
* .. extensibility ..
@@ -67,6 +68,7 @@
return instance;
}
+ @Override
protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint) {
AddressEndpoint addressEndpoint = new AddressEndpoint();
@@ -95,6 +97,7 @@
* @param elem XML configuration element
* @return EndpointDefinition object containing the endpoint details.
*/
+ @Override
public EndpointDefinition createEndpointDefinition(OMElement elem) {
OMAttribute address = elem.getAttribute(new QName("uri"));
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/AddressEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -34,10 +34,11 @@
*/
public class AddressEndpointSerializer extends DefaultEndpointSerializer {
+ @Override
protected OMElement serializeEndpoint(Endpoint endpoint) {
if (!(endpoint instanceof AddressEndpoint)) {
- throw new SynapseException("Invalid endpoint type.");
+ handleException("Invalid endpoint type.");
}
fac = OMAbstractFactory.getOMFactory();
@@ -57,6 +58,7 @@
return endpointElement;
}
+ @Override
public OMElement serializeEndpointDefinition(EndpointDefinition endpointDefinition) {
OMElement element = fac.createOMElement("address", SynapseConstants.SYNAPSE_OMNAMESPACE);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -87,7 +87,9 @@
return defaultEndpoint;
}
- protected void extractSpecificEndpointProperties(EndpointDefinition definition, OMElement elem) {
+ @Override
+ protected void extractSpecificEndpointProperties(EndpointDefinition definition,
+ OMElement elem) {
OMAttribute format
= elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "format"));
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DefaultEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -37,7 +37,7 @@
protected OMElement serializeEndpoint(Endpoint endpoint) {
if (!(endpoint instanceof DefaultEndpoint)) {
- throw new SynapseException("Invalid endpoint type.");
+ handleException("Invalid endpoint type.");
}
fac = OMAbstractFactory.getOMFactory();
@@ -57,7 +57,9 @@
return endpointElement;
}
- protected void serializeSpecificEndpointProperties(EndpointDefinition endpointDefinition, OMElement element) {
+ @Override
+ protected void serializeSpecificEndpointProperties(EndpointDefinition endpointDefinition,
+ OMElement element) {
if (SynapseConstants.FORMAT_POX.equals(endpointDefinition.getFormat())) {
element.addAttribute(fac.createOMAttribute("format", null, "pox"));
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -100,10 +100,8 @@
LoadBalanceMembershipHandler lbMembershipHandler =
(LoadBalanceMembershipHandler) Class.forName(clazz).newInstance();
Properties properties = new Properties();
- for (Iterator props =
- eventHandler.getChildrenWithName(new QName(SynapseConstants.SYNAPSE_NAMESPACE,
- "property"));
- props.hasNext();) {
+ for (Iterator props = eventHandler.getChildrenWithName(new QName(
+ SynapseConstants.SYNAPSE_NAMESPACE, "property")); props.hasNext();) {
OMElement prop = (OMElement) props.next();
String propName =
prop.getAttributeValue(new QName(XMLConfigConstants.NULL_NAMESPACE,
@@ -121,8 +119,8 @@
lbMembershipHandler.init(properties, algorithm);
loadbalanceEndpoint.setLoadBalanceMembershipHandler(lbMembershipHandler);
} catch (Exception e) {
- String msg = "Could not instantiate LoadBalanceMembershipHandler implementation " +
- clazz;
+ String msg = "Could not instantiate " +
+ "LoadBalanceMembershipHandler implementation " + clazz;
log.error(msg, e);
throw new SynapseException(msg, e);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/EndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -37,18 +37,22 @@
import java.util.Iterator;
/**
- * All endpoint factories should implement this interface. Use EndpointFactory to obtain the
+ * All endpoint factories should extend from this abstract class. Use EndpointFactory to obtain the
* correct endpoint for particular endpoint configuration. As endpoints can be nested inside
* each other, EndpointFactory implementations may call other EndpointFactory implementations
* recursively to obtain the required endpoint hierarchy.
* <p/>
- * This also serves as the XMLToObjactMapper implementation for specific endpoint implementations.
- * If the endpoint type is not known use XMLToEndpointMapper as the generic XMLToObjectMapper for
- * all endpoints.
+ * This also serves as the {@link XMLToObjectMapper} implementation for specific endpoint
+ * implementations. If the endpoint type is not known use {@link XMLToEndpointMapper} as the
+ * generic {@link XMLToObjectMapper} for all endpoints.
*/
public abstract class EndpointFactory implements XMLToObjectMapper {
- private static Log log = LogFactory.getLog(EndpointFactory.class);
+ protected static Log log;
+
+ protected EndpointFactory() {
+ log = LogFactory.getLog(this.getClass());
+ }
/**
* Core method which is exposed for the external use, and this will find the proper
@@ -268,8 +272,10 @@
}
}
- protected void extractSpecificEndpointProperties(EndpointDefinition definition, OMElement elem){
+ protected void extractSpecificEndpointProperties(EndpointDefinition definition,
+ OMElement elem) {
+ // overridden by the Factories which has specific building
}
/**
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=670352&r1=670351&r2=670352&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 Sun Jun 22 05:49:59 2008
@@ -28,20 +28,25 @@
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.endpoints.*;
import org.apache.synapse.endpoints.utils.EndpointDefinition;
-import org.apache.synapse.util.PolicyInfo;
/**
* All endpoint serializers should implement this interface. Use EndpointSerializer to
* obtain the correct EndpointSerializer implementation for a particular endpoint.
* EndpointSerializer implementation may call other EndpointSerializer implementations to serialize
* nested endpoints.
+ *
+ * @see EndpointFactory
*/
public abstract class EndpointSerializer {
- private static Log log = LogFactory.getLog(EndpointSerializer.class);
+ private static Log log;
protected OMFactory fac;
+ protected EndpointSerializer() {
+ log = LogFactory.getLog(this.getClass());
+ }
+
/**
* Core method which is exposed to the external use, and serializes the {@link Endpoint} to the
* XML format
@@ -134,8 +139,8 @@
"inboundPolicy", null, endpointDefinition.getInboundWsSecPolicyKey()));
}
if (endpointDefinition.getOutboundWsSecPolicyKey() != null) {
- sec.addAttribute(fac.createOMAttribute(
- "outboundPolicy", null, endpointDefinition.getOutboundWsSecPolicyKey()));
+ sec.addAttribute(fac.createOMAttribute("outboundPolicy",
+ null, endpointDefinition.getOutboundWsSecPolicyKey()));
}
}
element.addChild(sec);
@@ -174,8 +179,10 @@
}
}
- protected void serializeSpecificEndpointProperties(EndpointDefinition endpointDefinition, OMElement element){
+ protected void serializeSpecificEndpointProperties(EndpointDefinition endpointDefinition,
+ OMElement element) {
+ // overridden by the Serializers which has specific serialization
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -21,15 +21,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.FailoverEndpoint;
-import org.apache.synapse.endpoints.IndirectEndpoint;
-import org.apache.synapse.endpoints.utils.EndpointDefinition;
import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.Iterator;
/**
* Creates {@link FailoverEndpoint} using a XML configuration.
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/FailoverEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -19,38 +19,33 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.FailoverEndpoint;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.SynapseConstants;
-
-import java.util.List;
/**
* Serializes {@link FailoverEndpoint} to XML configuration.
*
- * <endpoint [name="name"]>
- * <failover>
- * <endpoint>+
- * </failover>
- * </endpoint>
+ * @see FailoverEndpointFactory
*/
public class FailoverEndpointSerializer extends EndpointSerializer {
protected OMElement serializeEndpoint(Endpoint endpoint) {
if (!(endpoint instanceof FailoverEndpoint)) {
- throw new SynapseException("Invalid endpoint type.");
+ handleException("Invalid endpoint type.");
}
FailoverEndpoint failoverEndpoint = (FailoverEndpoint) endpoint;
fac = OMAbstractFactory.getOMFactory();
- OMElement endpointElement = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
-
- OMElement failoverElement = fac.createOMElement("failover", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement endpointElement
+ = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement failoverElement
+ = fac.createOMElement("failover", SynapseConstants.SYNAPSE_OMNAMESPACE);
endpointElement.addChild(failoverElement);
String name = failoverEndpoint.getName();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -19,18 +19,14 @@
package org.apache.synapse.config.xml.endpoints;
+import org.apache.axiom.om.OMElement;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.IndirectEndpoint;
-import org.apache.synapse.SynapseException;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
/**
- * Creates an IndirectEndpoint using a XML configuration. Key can be a name of an endpoint defined
+ * Creates an {@link IndirectEndpoint} using a XML configuration. Key can be a name of an endpoint defined
* in the same Synapse configuration or a registry key pointing to an endpoint configuration in the
* registry (e.g. <endpoint key="registry/endpoint1.xml"/>).
*
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/IndirectEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -19,25 +19,24 @@
package org.apache.synapse.config.xml.endpoints;
-import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.synapse.SynapseConstants;
+import org.apache.synapse.SynapseException;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.IndirectEndpoint;
-import org.apache.synapse.SynapseException;
-import org.apache.synapse.SynapseConstants;
/**
* Serializes an {@link IndirectEndpoint} to an XML configuration.
*
- * <endpoint key="key"/>
+ * @see IndirectEndpointFactory
*/
public class IndirectEndpointSerializer extends EndpointSerializer {
protected OMElement serializeEndpoint(Endpoint endpoint) {
if (!(endpoint instanceof IndirectEndpoint)) {
- throw new SynapseException("Invalid endpoint type.");
+ handleException("Invalid endpoint type.");
}
fac = OMAbstractFactory.getOMFactory();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.config.xml.endpoints.utils.LoadbalanceAlgorithmFactory;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.LoadbalanceEndpoint;
@@ -30,7 +29,6 @@
import javax.xml.namespace.QName;
import java.util.ArrayList;
-import java.util.Iterator;
/**
* Creates {@link LoadbalanceEndpoint} using an XML configuration.
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -29,23 +29,17 @@
import org.apache.synapse.endpoints.algorithms.LoadbalanceAlgorithm;
import org.apache.synapse.endpoints.algorithms.RoundRobin;
-import java.util.List;
-
/**
* Serializes {@link LoadbalanceEndpoint} to an XML configuration.
*
- * <endpoint [name="name"]>
- * <loadbalance policy="load balance algorithm">
- * <endpoint>+
- * </loadbalance>
- * </endpoint>
+ * @see LoadbalanceEndpointFactory
*/
public class LoadbalanceEndpointSerializer extends EndpointSerializer {
protected OMElement serializeEndpoint(Endpoint endpoint) {
if (!(endpoint instanceof LoadbalanceEndpoint)) {
- throw new SynapseException("Invalid endpoint type.");
+ handleException("Invalid endpoint type.");
}
fac = OMAbstractFactory.getOMFactory();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.config.xml.endpoints.utils.LoadbalanceAlgorithmFactory;
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.SALoadbalanceEndpoint;
@@ -34,10 +33,9 @@
import javax.xml.namespace.QName;
import java.util.ArrayList;
-import java.util.Iterator;
/**
- * Creates {@link SALoadbalanceEndpoint} from a XML configuration.
+ * Creates {@link SALoadbalanceEndpoint} from an XML configuration.
*
* <endpoint [name="name"]>
* <session type="soap | ..other session types.." />
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/SALoadbalanceEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -31,6 +31,11 @@
import org.apache.synapse.endpoints.dispatch.SimpleClientSessionDispatcher;
import org.apache.synapse.endpoints.dispatch.SoapSessionDispatcher;
+/**
+ * Serializes {@link SALoadbalanceEndpoint} to an XML configuration.
+ *
+ * @see SALoadbalanceEndpointFactory
+ */
public class SALoadbalanceEndpointSerializer extends EndpointSerializer {
protected OMElement serializeEndpoint(Endpoint endpoint) {
@@ -43,7 +48,8 @@
SALoadbalanceEndpoint loadbalanceEndpoint = (SALoadbalanceEndpoint) endpoint;
fac = OMAbstractFactory.getOMFactory();
- OMElement endpointElement = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement endpointElement
+ = fac.createOMElement("endpoint", SynapseConstants.SYNAPSE_OMNAMESPACE);
String name = loadbalanceEndpoint.getName();
if (name != null) {
@@ -53,22 +59,26 @@
Dispatcher dispatcher = loadbalanceEndpoint.getDispatcher();
if (dispatcher instanceof SoapSessionDispatcher) {
- OMElement sessionElement = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement sessionElement
+ = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
sessionElement.addAttribute("type", "soap", null);
endpointElement.addChild(sessionElement);
} else if (dispatcher instanceof HttpSessionDispatcher) {
- OMElement sessionElement = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement sessionElement
+ = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
sessionElement.addAttribute("type", "http", null);
endpointElement.addChild(sessionElement);
} else if (dispatcher instanceof SimpleClientSessionDispatcher) {
- OMElement sessionElement = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement sessionElement
+ = fac.createOMElement("session", SynapseConstants.SYNAPSE_OMNAMESPACE);
sessionElement.addAttribute("type", "simpleClientSession", null);
endpointElement.addChild(sessionElement);
}
- OMElement loadbalanceElement = fac.createOMElement("loadbalance", SynapseConstants.SYNAPSE_OMNAMESPACE);
+ OMElement loadbalanceElement
+ = fac.createOMElement("loadbalance", SynapseConstants.SYNAPSE_OMNAMESPACE);
endpointElement.addChild(loadbalanceElement);
LoadbalanceAlgorithm algorithm = loadbalanceEndpoint.getAlgorithm();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java Sun Jun 22 05:49:59 2008
@@ -174,8 +174,4 @@
return wsdlEndpoint;
}
- protected void extractSpecificEndpointProperties(EndpointDefinition definition, OMElement elem) {
-
- }
-
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointSerializer.java Sun Jun 22 05:49:59 2008
@@ -28,7 +28,7 @@
import org.apache.synapse.endpoints.utils.EndpointDefinition;
/**
- * Serializes an WSDL based endpoint to an XML configuration.
+ * Serializes an {@link WSDLEndpoint} to an XML configuration.
*
* @see WSDLEndpointFactory
*/
@@ -82,7 +82,4 @@
return endpointElement;
}
- protected void serializeSpecificEndpointProperties(EndpointDefinition endpointDefinition, OMElement element) {
- }
-
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java?rev=670352&r1=670351&r2=670352&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/XMLToEndpointMapper.java Sun Jun 22 05:49:59 2008
@@ -25,9 +25,11 @@
import org.apache.axiom.om.OMElement;
/**
- * This is a generic XMLToObjectMapper implementation for all endpoint types. Use this if the endpoint
- * type is not known at the time mapper is created. If the endpoint type is known use the EndpointFactory
- * implementation for that specific endpoint.
+ * This is a generic XMLToObjectMapper implementation for all endpoint types. Use this if the
+ * endpoint type is not known at the time mapper is created. If the endpoint type is known use
+ * the EndpointFactory implementation for that specific endpoint.
+ *
+ * @see XMLToObjectMapper
*/
public class XMLToEndpointMapper implements XMLToObjectMapper {