You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by in...@apache.org on 2007/03/07 07:02:05 UTC
svn commit: r515467 - in /webservices/synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/config/xml/
extensions/src/main/java/org/apache/synapse/mediators/validate/
Author: indika
Date: Tue Mar 6 22:02:03 2007
New Revision: 515467
URL: http://svn.apache.org/viewvc?view=rev&rev=515467
Log:
fixed some minor issues
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java Tue Mar 6 22:02:03 2007
@@ -57,7 +57,12 @@
* The scope for a set-property mediator, when the property should be set
* on the underlying transport
*/
- String SCOPE_TRANSPORT = "transport";
+ String SCOPE_TRANSPORT = org.apache.synapse.Constants.SCOPE_TRANSPORT;
+
+ // -- Synapse message context property keys --
+ /** The scope for the synapse message context properties */
+ String SCOPE_DEFAULT = org.apache.synapse.Constants.SCOPE_DEFAULT;
+
// -- Synapse property values for WS-RM sequence handling --
/** The String value for a WS-RM version 1.0*/
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -107,7 +107,7 @@
// after successfully creating the mediator
// set its common attributes such as tracing etc
initMediator(filter,elem);
- super.addChildren(elem, filter);
+ addChildren(elem, filter);
return filter;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/FilterMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -66,7 +66,7 @@
}
finalizeSerialization(filter, mediator);
- super.serializeChildren(filter, mediator.getList());
+ serializeChildren(filter, mediator.getList());
if (parent != null) {
parent.addChild(filter);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -43,7 +43,7 @@
// after successfully creating the mediator
// set its common attributes such as tracing etc
initMediator(filter,elem);
- super.addChildren(elem, filter);
+ addChildren(elem, filter);
return filter;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/InMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -41,7 +41,7 @@
OMElement in = fac.createOMElement("in", synNS);
finalizeSerialization(in,mediator);
- super.serializeChildren(in, mediator.getList());
+ serializeChildren(in, mediator.getList());
if (parent != null) {
parent.addChild(in);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -45,7 +45,7 @@
// set its common attributes such as tracing etc
initMediator(filter,elem);
- super.addChildren(elem, filter);
+ addChildren(elem, filter);
return filter;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OutMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -40,7 +40,7 @@
OutMediator mediator = (OutMediator) m;
OMElement out = fac.createOMElement("out", synNS);
finalizeSerialization(out,mediator);
- super.serializeChildren(out, mediator.getList());
+ serializeChildren(out, mediator.getList());
if (parent != null) {
parent.addChild(out);
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -35,7 +35,7 @@
* Creates a property mediator through the supplied XML configuration
* <p/>
* <pre>
- * <property name="string" [action=set] (value="literal" | expression="xpath")/>
+ * <property name="string" [action=set/remove] (value="literal" | expression="xpath")/>
* </pre>
*/
public class PropertyMediatorFactory extends AbstractMediatorFactory {
@@ -78,11 +78,11 @@
}
if (scope != null) {
String valueStr = scope.getAttributeValue();
- if (!Constants.SCOPE_AXIS2.equals(valueStr) && !Constants.SCOPE_TRANSPORT.equals(valueStr))
- {
+ if (!Constants.SCOPE_AXIS2.equals(valueStr) && !Constants.SCOPE_TRANSPORT.equals(valueStr)
+ && !Constants.SCOPE_DEFAULT.equals(valueStr)) {
String msg = "Only '" + Constants.SCOPE_AXIS2 + "' or '" + Constants.SCOPE_TRANSPORT
+ "' values are allowed for attribute scope for a property mediator"
- + ", Unsupported scope " + scope.getAttributeValue();
+ + ", Unsupported scope " + valueStr;
log.error(msg);
throw new SynapseException(msg);
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/PropertyMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -28,7 +28,7 @@
/**
* <pre>
- * <property name="string" [action=set] (value="literal" | expression="xpath")/>
+ * <property name="string" [action=set/remove] (value="literal" | expression="xpath")/>
* </pre>
*/
public class PropertyMediatorSerializer extends AbstractMediatorSerializer {
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -61,7 +61,7 @@
seqMediator.setErrorHandler(e.getAttributeValue());
}
initMediator(seqMediator, elem);
- super.addChildren(elem, seqMediator);
+ addChildren(elem, seqMediator);
OMAttribute statistics = elem.getAttribute(
new QName(Constants.NULL_NAMESPACE, Constants.STATISTICS_ATTRIB_NAME));
if (statistics != null) {
@@ -89,7 +89,7 @@
seqMediator.setErrorHandler(e.getAttributeValue());
}
initMediator(seqMediator, elem);
- super.addChildren(elem, seqMediator);
+ addChildren(elem, seqMediator);
} else {
n = elem.getAttribute(new QName(Constants.NULL_NAMESPACE, "key"));
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SequenceMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -61,7 +61,7 @@
"onError", nullNS, mediator.getErrorHandler()));
}
finalizeSerialization(sequence, mediator);
- super.serializeChildren(sequence, mediator.getList());
+ serializeChildren(sequence, mediator.getList());
if (parent != null) {
parent.addChild(sequence);
}
@@ -111,7 +111,7 @@
"onError", nullNS, mediator.getErrorHandler()));
}
finalizeSerialization(sequence, mediator);
- super.serializeChildren(sequence, mediator.getList());
+ serializeChildren(sequence, mediator.getList());
}
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -49,7 +49,7 @@
// set its common attributes such as tracing etc
initMediator(sm,elem);
- super.addChildren(elem, sm);
+ addChildren(elem, sm);
return sm;
}
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseMediatorSerializer.java Tue Mar 6 22:02:03 2007
@@ -48,7 +48,7 @@
OMElement rules = fac.createOMElement("rules", synNS);
finalizeSerialization(rules,mediator);
- super.serializeChildren(rules, mediator.getList());
+ serializeChildren(rules, mediator.getList());
if (parent != null) {
parent.addChild(rules);
Modified: webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java?view=diff&rev=515467&r1=515466&r2=515467
==============================================================================
--- webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java (original)
+++ webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/validate/ValidateMediatorFactory.java Tue Mar 6 22:02:03 2007
@@ -108,7 +108,7 @@
}
if (onFail != null && onFail.getChildElements().hasNext()) {
- super.addChildren(onFail, validateMediator);
+ addChildren(onFail, validateMediator);
} else {
handleException("A non-empty <on-fail> child element is required for " +
"the <validate> mediator");
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org