Author: ruwan
Date: Sun Sep 26 15:19:17 2010
New Revision: 1001449
URL: http://svn.apache.org/viewvc?rev=1001449&view=rev
Log:
Fixing schema, adding script mediator
Added:
synapse/trunk/java/repository/schema/mediators/extension/
synapse/trunk/java/repository/schema/mediators/extension/script.xsd
Modified:
synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
synapse/trunk/java/repository/conf/sample/synapse_sample_256.xml
synapse/trunk/java/repository/schema/mediators/core/property.xsd
synapse/trunk/java/repository/schema/mediators/mediators.xsd
synapse/trunk/java/repository/schema/mediators/transformation/fault.xsd
synapse/trunk/java/repository/schema/proxy.xsd
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml?rev=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_151.xml Sun Sep 26
15:19:17 2010
@@ -41,13 +41,13 @@
</sequence>
<proxy name="StockQuoteProxy1">
- <publishWSDL key="proxy_wsdl"/>
<target inSequence="proxy_1" outSequence="out"/>
+ <publishWSDL key="proxy_wsdl"/>
</proxy>
<proxy name="StockQuoteProxy2">
- <publishWSDL key="proxy_wsdl"/>
<target endpoint="proxy_2_endpoint" outSequence="out"/>
+ <publishWSDL key="proxy_wsdl"/>
</proxy>
</definitions>
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml?rev=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_255.xml Sun Sep 26
15:19:17 2010
@@ -22,10 +22,6 @@
<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration";>
<proxy name="StockQuoteProxy" transports="vfs">
- <parameter
name="transport.vfs.FileURI">vfs:ftp://guest:gu...@localhost/test?vfs.passive=true</parameter>
<!--CHANGE-->
- <parameter name="transport.vfs.ContentType">text/xml</parameter>
- <parameter name="transport.vfs.FileNamePattern">.*\.xml</parameter>
- <parameter name="transport.PollInterval">15</parameter>
<target>
<inSequence>
@@ -44,6 +40,11 @@
</outSequence>
</target>
<publishWSDL
uri="file:repository/conf/sample/resources/proxy/sample_proxy_1.wsdl"/>
+
+ <parameter
name="transport.vfs.FileURI">vfs:ftp://guest:gu...@localhost/test?vfs.passive=true</parameter>
<!--CHANGE-->
+ <parameter name="transport.vfs.ContentType">text/xml</parameter>
+ <parameter name="transport.vfs.FileNamePattern">.*\.xml</parameter>
+ <parameter name="transport.PollInterval">15</parameter>
</proxy>
</definitions>
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_256.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_256.xml?rev=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_256.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_256.xml Sun Sep 26
15:19:17 2010
@@ -23,18 +23,6 @@
<proxy name="StockQuoteProxy" transports="mailto">
- <parameter
name="transport.mail.Address">[email protected]</parameter>
- <parameter name="transport.mail.Protocol">pop3</parameter>
- <parameter name="transport.PollInterval">5</parameter>
- <parameter name="mail.pop3.host">pop.gmail.com</parameter>
- <parameter name="mail.pop3.port">995</parameter>
- <parameter name="mail.pop3.user">synapse.demo.1</parameter>
- <parameter name="mail.pop3.password">mailpassword</parameter>
- <parameter
name="mail.pop3.socketFactory.class">javax.net.ssl.SSLSocketFactory</parameter>
- <parameter name="mail.pop3.socketFactory.fallback">false</parameter>
- <parameter name="mail.pop3.socketFactory.port">995</parameter>
- <parameter
name="transport.mail.ContentType">application/xml</parameter>
-
<target>
<inSequence>
<property name="senderAddress"
expression="get-property('transport', 'From')"/>
@@ -58,6 +46,19 @@
</outSequence>
</target>
<publishWSDL
uri="file:repository/conf/sample/resources/proxy/sample_proxy_1.wsdl"/>
+
+ <parameter
name="transport.mail.Address">[email protected]</parameter>
+ <parameter name="transport.mail.Protocol">pop3</parameter>
+ <parameter name="transport.PollInterval">5</parameter>
+ <parameter name="mail.pop3.host">pop.gmail.com</parameter>
+ <parameter name="mail.pop3.port">995</parameter>
+ <parameter name="mail.pop3.user">synapse.demo.1</parameter>
+ <parameter name="mail.pop3.password">mailpassword</parameter>
+ <parameter
name="mail.pop3.socketFactory.class">javax.net.ssl.SSLSocketFactory</parameter>
+ <parameter name="mail.pop3.socketFactory.fallback">false</parameter>
+ <parameter name="mail.pop3.socketFactory.port">995</parameter>
+ <parameter
name="transport.mail.ContentType">application/xml</parameter>
+
</proxy>
</definitions>
Modified: 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=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/core/property.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/core/property.xsd Sun Sep 26
15:19:17 2010
@@ -32,6 +32,16 @@
</xs:annotation>
<xs:complexType>
<xs:attributeGroup ref="nameValueOrExpression"/>
+ <xs:attribute name="scope" use="optional" default="default">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="default"/>
+ <xs:enumeration value="axis2"/>
+ <xs:enumeration value="transport"/>
+ <xs:enumeration value="axis2-client"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:complexType>
</xs:element>
Added: synapse/trunk/java/repository/schema/mediators/extension/script.xsd
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/extension/script.xsd?rev=1001449&view=auto
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/extension/script.xsd (added)
+++ synapse/trunk/java/repository/schema/mediators/extension/script.xsd Sun Sep
26 15:19:17 2010
@@ -0,0 +1,44 @@
+<?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:element name="script">
+ <xs:annotation>
+ <xs:documentation source="description">
+ Script mediator to process messages using the specified script
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType mixed="true">
+ <xs:attribute name="language" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="js"/>
+ <xs:enumeration value="ruby"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="src" type="xs:string" use="optional"/>
+ </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=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/mediators.xsd (original)
+++ synapse/trunk/java/repository/schema/mediators/mediators.xsd Sun Sep 26
15:19:17 2010
@@ -34,6 +34,7 @@
<xs:include schemaLocation="filter/switch.xsd"/>
<xs:include schemaLocation="transformation/fault.xsd"/>
<xs:include schemaLocation="advanced/rm_sequence.xsd"/>
+ <xs:include schemaLocation="extension/script.xsd"/>
<xs:group name="mediatorList">
<xs:annotation>
@@ -64,6 +65,7 @@
<xs:element ref="switch"/>
<xs:element ref="RMSequence"/>
<xs:element ref="makefault"/>
+ <xs:element ref="script"/>
</xs:choice>
</xs:group>
Modified:
synapse/trunk/java/repository/schema/mediators/transformation/fault.xsd
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/mediators/transformation/fault.xsd?rev=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/mediators/transformation/fault.xsd
(original)
+++ synapse/trunk/java/repository/schema/mediators/transformation/fault.xsd Sun
Sep 26 15:19:17 2010
@@ -54,13 +54,13 @@
</xs:element>
<xs:element name="node" minOccurs="0" maxOccurs="1"
type="xs:anyType"/>
<xs:element name="role" minOccurs="0" maxOccurs="1"
type="xs:anyType"/>
- <xs:element name="detail" type="xs:anyType" minOccurs="0"
maxOccurs="1">
+ <xs:element name="detail" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation source="description">
The fault Detail
</xs:documentation>
</xs:annotation>
- <xs:complexType>
+ <xs:complexType mixed="true">
<xs:attribute name="expression" type="xs:string"
use="optional"/>
</xs:complexType>
</xs:element>
Modified: synapse/trunk/java/repository/schema/proxy.xsd
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/schema/proxy.xsd?rev=1001449&r1=1001448&r2=1001449&view=diff
==============================================================================
--- synapse/trunk/java/repository/schema/proxy.xsd (original)
+++ synapse/trunk/java/repository/schema/proxy.xsd Sun Sep 26 15:19:17 2010
@@ -74,7 +74,7 @@
</xs:attribute>
</xs:complexType>
</xs:element>
- <xs:element ref="parameter" minOccurs="0"/>
+ <xs:element ref="parameter" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attributeGroup ref="monitoringAspect"/>
<xs:attribute name="name" type="xs:string" use="required"/>
