You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2006/11/21 12:40:11 UTC
svn commit: r477634 - in /incubator/synapse/trunk/java:
modules/core/src/main/java/org/apache/synapse/config/xml/
repository/conf/sample/
Author: asankha
Date: Tue Nov 21 03:40:10 2006
New Revision: 477634
URL: http://svn.apache.org/viewvc?view=rev&rev=477634
Log:
committing for indika
Modified:
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java
incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_104.xml
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java?view=diff&rev=477634&r1=477633&r2=477634
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorFactory.java Tue Nov 21 03:40:10 2006
@@ -75,6 +75,10 @@
faultMediator.setSoapVersion(FaultMediator.SOAP11);
} else if (SOAP12.equals(version.getAttributeValue())) {
faultMediator.setSoapVersion(FaultMediator.SOAP12);
+ }else {
+ String msg = "Invalid SOAP version";
+ log.error(msg);
+ throw new SynapseException(msg);
}
}
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java?view=diff&rev=477634&r1=477633&r2=477634
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FaultMediatorSerializer.java Tue Nov 21 03:40:10 2006
@@ -42,6 +42,10 @@
private static final Log log = LogFactory.getLog(FaultMediatorSerializer.class);
+ private static final String SOAP11 = "soap11";
+
+ private static final String SOAP12 = "soap12";
+
public OMElement serializeMediator(OMElement parent, Mediator m) {
if (!(m instanceof FaultMediator)) {
@@ -51,10 +55,18 @@
FaultMediator mediator = (FaultMediator) m;
OMElement fault = fac.createOMElement("makefault", synNS);
+ if(mediator.getSoapVersion()==FaultMediator.SOAP11) {
+ fault.addAttribute(fac.createOMAttribute(
+ "version", nullNS, SOAP11));
+ }else if(mediator.getSoapVersion()==FaultMediator.SOAP12) {
+ fault.addAttribute(fac.createOMAttribute(
+ "version", nullNS, SOAP12));
+ }
+
OMElement code = fac.createOMElement("code", synNS, fault);
if (mediator.getFaultCodeValue() != null) {
code.addAttribute(fac.createOMAttribute(
- "code", nullNS, mediator.getFaultCodeValue().toString()));
+ "value", nullNS, mediator.getFaultCodeValue().toString()));
} else if (mediator.getFaultCodeExpr() != null) {
code.addAttribute(fac.createOMAttribute(
@@ -68,7 +80,7 @@
OMElement reason = fac.createOMElement("reason", synNS, fault);
if (mediator.getFaultReasonValue() != null) {
reason.addAttribute(fac.createOMAttribute(
- "code", nullNS, mediator.getFaultReasonValue()));
+ "value", nullNS, mediator.getFaultReasonValue()));
} else if (mediator.getFaultReasonExpr() != null) {
reason.addAttribute(fac.createOMAttribute(
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?view=diff&rev=477634&r1=477633&r2=477634
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java Tue Nov 21 03:40:10 2006
@@ -59,26 +59,29 @@
SequenceMediator seqMediator = new SequenceMediator();
OMAttribute n = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "name"));
+ OMAttribute e = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "onError"));
if (n != null) {
seqMediator.setName(n.getAttributeValue());
+ if (e != null) {
+ seqMediator.setErrorHandler(e.getAttributeValue());
+ }
super.addChildren(elem, seqMediator);
} else {
n = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "ref"));
if (n != null) {
seqMediator.setRef(n.getAttributeValue());
-
+ if (e != null) {
+ String msg = "A sequence mediator swhich a reference to another sequence can not have 'ErrorHandler'";
+ log.error(msg);
+ throw new SynapseException(msg);
+ }
} else {
String msg = "A sequence mediator should be a named sequence or a reference to another sequence " +
"(i.e. a name attribute or ref attribute is required.";
log.error(msg);
throw new SynapseException(msg);
}
- }
-
- OMAttribute e = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "onError"));
- if (e != null) {
- seqMediator.setErrorHandler(e.getAttributeValue());
}
return seqMediator;
Modified: incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java?view=diff&rev=477634&r1=477633&r2=477634
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchCaseMediatorSerializer.java Tue Nov 21 03:40:10 2006
@@ -45,7 +45,7 @@
caseElem = fac.createOMElement("case", synNS);
}
- if (mediator.isDefaultCase()) {
+ if (!mediator.isDefaultCase()) {
if (mediator.getRegex() != null) {
caseElem.addAttribute(fac.createOMAttribute(
"regex", nullNS, mediator.getRegex().pattern()));
Modified: incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_104.xml
URL: http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_104.xml?view=diff&rev=477634&r1=477633&r2=477634
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_104.xml (original)
+++ incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_104.xml Tue Nov 21 03:40:10 2006
@@ -30,6 +30,9 @@
</sequence>
<sequence name="proxy_out">
+ <log level="custom">
+ <property name="message" value="Executing inside the out sequence"/>
+ </log>
<send/>
</sequence>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org