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 2010/07/10 13:38:50 UTC
svn commit: r962812 - in /synapse/trunk/java/repository/schema:
mediators/core/header.xsd mediators/core/log.xsd
mediators/core/property.xsd mediators/mediators.xsd misc/common.xsd
Author: ruwan
Date: Sat Jul 10 11:38:50 2010
New Revision: 962812
URL: http://svn.apache.org/viewvc?rev=962812&view=rev
Log:
Adding property mediator and modifying the way mediator properties
Added:
synapse/trunk/java/repository/schema/mediators/core/property.xsd
Modified:
synapse/trunk/java/repository/schema/mediators/core/header.xsd
synapse/trunk/java/repository/schema/mediators/core/log.xsd
synapse/trunk/java/repository/schema/mediators/mediators.xsd
synapse/trunk/java/repository/schema/misc/common.xsd
Modified: synapse/trunk/java/repository/schema/mediators/core/header.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/core/header.xsd?rev=962812&r1=962811&r2=962812&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/core/header.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/core/header.xsd Sat Jul 10 11:38:50 2010
@@ -21,6 +21,8 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
targetNamespace="http://synapse.apache.org/ns/2010/04/configuration"
xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+
+ <xs:include schemaLocation="../../misc/common.xsd"/>
<xs:element name="header">
<xs:annotation>
@@ -29,24 +31,8 @@
</xs:documentation>
</xs:annotation>
<xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="optional"/>
- <xs:attribute name="expression" type="xs:string" use="optional"/>
- <xs:attribute name="action" type="setRemove" use="optional"/>
+ <xs:attributeGroup ref="nameValueOrExpression"/>
</xs:complexType>
</xs:element>
- <xs:simpleType name="setRemove">
- <xs:annotation>
- <xs:documentation source="description">
- This simple type represents the possible values for
- the header mediator action attribute
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="set"/>
- <xs:enumeration value="remove"/>
- </xs:restriction>
- </xs:simpleType>
-
</xs:schema>
\ No newline at end of file
Modified: synapse/trunk/java/repository/schema/mediators/core/log.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/core/log.xsd?rev=962812&r1=962811&r2=962812&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/core/log.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/core/log.xsd Sat Jul 10 11:38:50 2010
@@ -32,7 +32,7 @@
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="property" type="mediatorProperty" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="level" type="logLevel" use="required" default="simple"/>
<xs:attribute name="separator" type="xs:string" use="optional" default=", "/>
Added: synapse/trunk/java/repository/schema/mediators/core/property.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/core/property.xsd?rev=962812&view=auto
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/core/property.xsd (added)
+++ synapse/trunk/java/repository/schema/mediators/core/property.xsd Sat Jul 10 11:38:50 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ targetNamespace="http://synapse.apache.org/ns/2010/04/configuration"
+ xmlns="http://synapse.apache.org/ns/2010/04/configuration">
+
+ <xs:include schemaLocation="../../misc/common.xsd"/>
+
+ <xs:element name="property">
+ <xs:annotation>
+ <xs:documentation source="description">
+ Property mediator to process properties of the messages
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attributeGroup ref="nameValueOrExpression"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Modified: synapse/trunk/java/repository/schema/mediators/mediators.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/mediators.xsd?rev=962812&r1=962811&r2=962812&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/mediators.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/mediators.xsd Sat Jul 10 11:38:50 2010
@@ -27,6 +27,7 @@
<xs:include schemaLocation="core/header.xsd"/>
<xs:include schemaLocation="core/send.xsd"/>
<xs:include schemaLocation="core/log.xsd"/>
+ <xs:include schemaLocation="core/property.xsd"/>
<xs:group name="mediatorList">
<xs:annotation>
@@ -40,6 +41,7 @@
<xs:element ref="header"/>
<xs:element ref="send"/>
<xs:element ref="log"/>
+ <xs:element ref="property"/>
</xs:choice>
</xs:group>
Modified: synapse/trunk/java/repository/schema/misc/common.xsd
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/misc/common.xsd?rev=962812&r1=962811&r2=962812&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/misc/common.xsd (original)
+++ synapse/trunk/java/repository/schema/misc/common.xsd Sat Jul 10 11:38:50 2010
@@ -54,24 +54,6 @@
</xs:complexType>
</xs:element>
- <xs:element name="property">
- <xs:annotation>
- <xs:documentation source="description">
- These are the properties which could be name value pairs or could be
- xpath expression extracting the property value by evaluating over the message
- </xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:complexContent mixed="true">
- <xs:extension base="xs:anyType">
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="optional"/>
- <xs:attribute name="expression" type="xs:string" use="optional"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
<xs:group name="inlineWsdl">
<xs:choice>
<xs:element ref="wsdl11:definitions" minOccurs="0" maxOccurs="1"/>
@@ -90,6 +72,36 @@
<xs:attribute name="trace" default="disabled" type="enableDisable" use="optional"/>
</xs:attributeGroup>
+ <xs:attributeGroup name="nameValueOrExpression">
+ <xs:annotation>
+ <xs:documentation>
+ This group of attributes are mainly used in header and property mediators
+ to provide the name value or expression pairs as its configuration
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="optional"/>
+ <xs:attribute name="expression" type="xs:string" use="optional"/>
+ <xs:attribute name="action" type="setRemove" use="optional"/>
+ </xs:attributeGroup>
+
+ <xs:complexType name="mediatorProperty">
+ <xs:annotation>
+ <xs:documentation source="description">
+ These are the properties which could be name value pairs or could be
+ xpath expression extracting the property value by evaluating over
+ the message
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexContent mixed="true">
+ <xs:extension base="xs:anyType">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="optional"/>
+ <xs:attribute name="expression" type="xs:string" use="optional"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
<xs:simpleType name="enableDisable">
<xs:annotation>
<xs:documentation source="description">
@@ -103,4 +115,17 @@
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="setRemove">
+ <xs:annotation>
+ <xs:documentation source="description">
+ This simple type represents the possible values for
+ the header mediator action attribute
+ </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="set"/>
+ <xs:enumeration value="remove"/>
+ </xs:restriction>
+ </xs:simpleType>
+
</xs:schema>
\ No newline at end of file