Author: indika
Date: Mon Oct 15 23:35:42 2007
New Revision: 585056
URL: http://svn.apache.org/viewvc?rev=585056&view=rev
Log:
change the thottle and xquery namespaces for synapse namespace
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_600.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_601.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_602.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_700.xml
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_701.xml
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
Mon Oct 15 23:35:42 2007
@@ -42,7 +42,7 @@
* The Tag Name for throttle
*/
private static final QName TAG_NAME
- = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE + "/throttle",
"throttle");
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "throttle");
public Mediator createMediator(OMElement elem) {
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
Mon Oct 15 23:35:42 2007
@@ -38,14 +38,14 @@
private static final Log log =
LogFactory.getLog(ThrottleMediatorSerializer.class);
private static final OMNamespace throttleNS
- = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE +
"/throttle", "throttle");
+ = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE,
"throttle");
public OMElement serializeMediator(OMElement parent, Mediator m) {
if (!(m instanceof ThrottleMediator)) {
handleException("Invalid Mediator has passed to serializer");
}
ThrottleMediator throttleMediator = (ThrottleMediator) m;
- OMElement throttle = fac.createOMElement("throttle", throttleNS);
+ OMElement throttle = fac.createOMElement("throttle", synNS);
OMElement policy = fac.createOMElement("policy", synNS);
String key = throttleMediator.getPolicyKey();
if (key != null) {
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
Mon Oct 15 23:35:42 2007
@@ -56,7 +56,7 @@
private static final Log log =
LogFactory.getLog(XQueryMediatorFactory.class);
private static final QName TAG_NAME
- = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE + "/xquery",
"xquery");
+ = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "xquery");
public static final QName ATT_NAME_Q = new
QName(XMLConfigConstants.NULL_NAMESPACE, "name");
public static final QName ATT_VALUE_Q = new
QName(XMLConfigConstants.NULL_NAMESPACE, "value");
public static final QName ATT_EXPR_Q = new
QName(XMLConfigConstants.NULL_NAMESPACE, "expression");
Modified:
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
Mon Oct 15 23:35:42 2007
@@ -53,7 +53,7 @@
private static final Log log =
LogFactory.getLog(XQueryMediatorSerializer.class);
private static final OMNamespace XQUERY_NS
- = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE +
"/xquery", "xquery");
+ = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE,
"xquery");
public OMElement serializeMediator(OMElement parent, Mediator m) {
@@ -62,7 +62,7 @@
}
XQueryMediator queryMediator = (XQueryMediator) m;
- OMElement xquery = fac.createOMElement("xquery", XQUERY_NS);
+ OMElement xquery = fac.createOMElement("xquery", synNS);
String key = queryMediator.getQueryKey();
if (key != null) {
xquery.addAttribute(fac.createOMAttribute(
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializationTest.java
Mon Oct 15 23:35:42 2007
@@ -37,8 +37,8 @@
}
public void testThrottleMediatorSerializationSenarioOne() throws Exception
{
- String inputXml = "<throttle:throttle id=\"A\"
xmlns:throttle=\"http://ws.apache.org/ns/synapse/throttle\";
xmlns=\"http://ws.apache.org/ns/synapse\"; >" +
- "<policy key=\"thottleKey\"/></throttle:throttle>";
+ String inputXml = "<throttle id=\"A\"
xmlns=\"http://ws.apache.org/ns/synapse\"; >" +
+ "<policy key=\"thottleKey\"/></throttle>";
assertTrue(serialization(inputXml, throttleMediatorFactory,
throttleMediatorSerializer));
assertTrue(serialization(inputXml, throttleMediatorSerializer));
}
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializationTest.java
Mon Oct 15 23:35:42 2007
@@ -34,7 +34,7 @@
}
public void testXQueryMediatorSerializationSenarioOne() throws Exception {
- String inputXml = "<xquery:xquery
xmlns:xquery=\"http://ws.apache.org/ns/synapse/xquery\";
xmlns=\"http://ws.apache.org/ns/synapse\"; key=\"querykey\" target=\"target\">" +
+ String inputXml = "<xquery xmlns=\"http://ws.apache.org/ns/synapse\";
key=\"querykey\" target=\"target\">" +
"<dataSource>" +
"<property name=\"username\" value=\"valueone\" />" +
"</dataSource>" +
@@ -49,7 +49,7 @@
"<variable name=\"b1\" key=\"xmlkey\"
type=\"DOCUMENT\" />" +
"<variable name=\"b1\" key=\"xmlkey\"
type=\"DOCUMENT_ELEMENT\" />" +
"<variable name=\"b1\" key=\"xmlkey\"
type=\"ELEMENT\" />" +
- "</xquery:xquery>";
+ "</xquery>";
assertTrue(serialization(inputXml, factory, serializer));
}
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_600.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_600.xml?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_600.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_600.xml
Mon Oct 15 23:35:42 2007
@@ -16,11 +16,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions xmlns="http://ws.apache.org/ns/synapse";
- xmlns:throttle="http://ws.apache.org/ns/synapse/throttle";>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<sequence name="main">
<in>
- <throttle:throttle id="A">
+ <throttle id="A">
<policy>
<!-- define throttle policy -->
<wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
@@ -54,10 +53,10 @@
<send/>
<drop/>
</onReject>
- </throttle:throttle>
+ </throttle>
</in>
<out>
- <throttle:throttle id="A"/>
+ <throttle id="A"/>
<send/>
</out>
</sequence>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_601.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_601.xml?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_601.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_601.xml
Mon Oct 15 23:35:42 2007
@@ -16,11 +16,10 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions xmlns="http://ws.apache.org/ns/synapse";
- xmlns:throttle="http://ws.apache.org/ns/synapse/throttle";>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<sequence name="main">
<in>
- <throttle:throttle id="A">
+ <throttle id="A">
<policy>
<!-- define throttle policy -->
<wsp:Policy
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
@@ -98,10 +97,10 @@
<send/>
<drop/>
</onReject>
- </throttle:throttle>
+ </throttle>
</in>
<out>
- <throttle:throttle id="A"/>
+ <throttle id="A"/>
<send/>
</out>
</sequence>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_602.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_602.xml?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_602.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_602.xml
Mon Oct 15 23:35:42 2007
@@ -16,8 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions xmlns="http://ws.apache.org/ns/synapse";
- xmlns:throttle="http://ws.apache.org/ns/synapse/throttle";>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
<!-- the root property of the simple URL registry helps resolve a
resource URL as root + key -->
@@ -57,12 +56,12 @@
<proxy name="StockQuoteProxy">
<target>
<inSequence>
- <throttle:throttle onReject="onRejectSequence"
onAccept="onAcceptSequence" id="A">
+ <throttle onReject="onRejectSequence"
onAccept="onAcceptSequence" id="A">
<policy key="thottlePolicy"/>
- </throttle:throttle>
+ </throttle>
</inSequence>
<outSequence>
- <throttle:throttle id="A"/>
+ <throttle id="A"/>
<send/>
</outSequence>
</target>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_700.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_700.xml?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_700.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_700.xml
Mon Oct 15 23:35:42 2007
@@ -17,8 +17,7 @@
~ under the License.
-->
<!-- introduction to URL source properties, registry based properties
and the XSLT mediator -->
-<definitions xmlns="http://ws.apache.org/ns/synapse";
- xmlns:xquery="http://ws.apache.org/ns/synapse/xquery";>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<!-- the SimpleURLRegistry allows access to a URL based registry (e.g.
file:/// or http://) -->
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
@@ -33,10 +32,10 @@
<proxy name="StockQuoteProxy">
<target>
<inSequence>
- <xquery:xquery key="xquery-key-req">
+ <xquery key="xquery-key-req">
<variable name="payload" type="ELEMENT"/>
- </xquery:xquery>
+ </xquery>
<send>
<endpoint>
<address
uri="http://localhost:9000/soap/SimpleStockQuoteService"/>
@@ -45,9 +44,9 @@
</inSequence>
<outSequence>
<out>
- <xquery:xquery key="xquery/xquery_res.xq">
+ <xquery key="xquery/xquery_res.xq">
<variable name="payload" type="ELEMENT"/>
- </xquery:xquery>
+ </xquery>
<send/>
</out>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_701.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_701.xml?rev=585056&r1=585055&r2=585056&view=diff
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_701.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_701.xml
Mon Oct 15 23:35:42 2007
@@ -17,8 +17,7 @@
~ under the License.
-->
<!-- introduction to URL source properties, registry based properties
and the XSLT mediator -->
-<definitions xmlns="http://ws.apache.org/ns/synapse";
- xmlns:xquery="http://ws.apache.org/ns/synapse/xquery";>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<!-- the SimpleURLRegistry allows access to a URL based registry (e.g.
file:/// or http://) -->
<registry provider="org.apache.synapse.registry.url.SimpleURLRegistry">
@@ -39,11 +38,11 @@
</inSequence>
<outSequence>
<out>
- <xquery:xquery key="xquery/xquery_commisson.xq">
+ <xquery key="xquery/xquery_commisson.xq">
<variable name="payload" type="ELEMENT"></variable>
<variable name="commission" type="ELEMENT"
key="misc/commission.xml"></variable>
- </xquery:xquery>
+ </xquery>
<send/>
</out>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
