Author: hiranya
Date: Tue Apr 27 05:34:20 2010
New Revision: 938326
URL: http://svn.apache.org/viewvc?rev=938326&view=rev
Log:
Fixing SYNAPSE-627
Auto generated names are no longer serialized by the Endpoint serializer. This
fixes all 7 test failures currently in the Synapse core.
Modified:
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/DefaultEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.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/FailoverEndpointSerializer.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/ResolvingEndpointSerializer.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/WSDLEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -46,7 +46,8 @@ public class AddressEndpointSerializer e
AddressEndpoint addressEndpoint = (AddressEndpoint) endpoint;
String name = addressEndpoint.getName();
- if (name != null) {
+ boolean anon = addressEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -45,7 +45,8 @@ public class DefaultEndpointSerializer e
DefaultEndpoint defaultEndpoint = (DefaultEndpoint) endpoint;
String name = defaultEndpoint.getName();
- if (name != null) {
+ boolean anon = defaultEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java?rev=938326&r1=938325&r2=938326&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/DynamicLoadbalanceEndpointSerializer.java
Tue Apr 27 05:34:20 2010
@@ -57,7 +57,8 @@ public class DynamicLoadbalanceEndpointS
String name = dynamicLoadbalanceEndpoint.getName();
- if (name != null) {
+ boolean anon = dynamicLoadbalanceEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -31,6 +31,7 @@ import org.apache.synapse.config.xml.XML
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.endpoints.IndirectEndpoint;
import org.apache.synapse.endpoints.EndpointDefinition;
+import org.apache.synapse.endpoints.AbstractEndpoint;
import org.apache.synapse.util.UUIDGenerator;
import javax.xml.namespace.QName;
@@ -108,10 +109,13 @@ public abstract class EndpointFactory im
Endpoint ep = createEndpoint(epConfig, anonymousEndpoint);
// if the endpoint doesn't have a name we will generate a unique name.
- if (ep.getName() == null) {
+ if (anonymousEndpoint && ep.getName() == null) {
String uuid = UUIDGenerator.getUUID();
uuid = uuid.replace(':', '_');
ep.setName(ENDPOINT_NAME_PREFIX + uuid);
+ if (ep instanceof AbstractEndpoint) {
+ ((AbstractEndpoint) ep).setAnonymous(true);
+ }
}
return ep;
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -49,7 +49,8 @@ public class FailoverEndpointSerializer
endpointElement.addChild(failoverElement);
String name = failoverEndpoint.getName();
- if (name != null) {
+ boolean anon = failoverEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -49,7 +49,8 @@ public class LoadbalanceEndpointSerializ
LoadbalanceEndpoint loadbalanceEndpoint = (LoadbalanceEndpoint)
endpoint;
String name = loadbalanceEndpoint.getName();
- if (name != null) {
+ boolean anon = loadbalanceEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java?rev=938326&r1=938325&r2=938326&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/ResolvingEndpointSerializer.java
Tue Apr 27 05:34:20 2010
@@ -44,7 +44,7 @@ public class ResolvingEndpointSerializer
ResolvingEndpoint resolvingEndpoint = (ResolvingEndpoint) endpoint;
SynapseXPathSerializer.serializeXPath(resolvingEndpoint.getKeyExpression(),
endpointElement, "key-expression");
- if (resolvingEndpoint.getName() != null) {
+ if (resolvingEndpoint.getName() != null &&
!resolvingEndpoint.isAnonymous()) {
endpointElement.addAttribute("name", resolvingEndpoint.getName(),
null);
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -53,7 +53,8 @@ public class SALoadbalanceEndpointSerial
= fac.createOMElement("endpoint",
SynapseConstants.SYNAPSE_OMNAMESPACE);
String name = loadbalanceEndpoint.getName();
- if (name != null) {
+ boolean anon = loadbalanceEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
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=938326&r1=938325&r2=938326&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
Tue Apr 27 05:34:20 2010
@@ -45,7 +45,8 @@ public class WSDLEndpointSerializer exte
WSDLEndpoint wsdlEndpoint = (WSDLEndpoint) endpoint;
String name = wsdlEndpoint.getName();
- if (name != null) {
+ boolean anon = wsdlEndpoint.isAnonymous();
+ if (name != null && !anon) {
endpointElement.addAttribute("name", name, null);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=938326&r1=938325&r2=938326&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
Tue Apr 27 05:34:20 2010
@@ -72,6 +72,8 @@ public abstract class AbstractEndpoint e
/** The name of the file where this endpoint is defined */
protected String fileName;
+ protected boolean anonymous = false;
+
protected AbstractEndpoint() {
log = LogFactory.getLog(this.getClass());
}
@@ -127,6 +129,14 @@ public abstract class AbstractEndpoint e
this.fileName = fileName;
}
+ public boolean isAnonymous() {
+ return anonymous; //To change body of implemented methods use File |
Settings | File Templates.
+ }
+
+ public void setAnonymous(boolean anonymous) {
+ this.anonymous = anonymous;
+ }
+
public String toString() {
if (endpointName != null) {
return "Endpoint [" + endpointName + "]";
