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/28 18:29:34 UTC
svn commit: r980116 - in /synapse/trunk/java:
modules/migrator/src/main/resources/synapse-configuration-migrator.xslt
repository/conf/sample/synapse_sample_500.xml
Author: ruwan
Date: Wed Jul 28 16:29:34 2010
New Revision: 980116
URL: http://svn.apache.org/viewvc?rev=980116&view=rev
Log:
fixing the migration XSLT to take eventsources into account
Modified:
synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt
synapse/trunk/java/repository/conf/sample/synapse_sample_500.xml
Modified: synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt?rev=980116&r1=980115&r2=980116&view=diff
==============================================================================
--- synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt (original)
+++ synapse/trunk/java/modules/migrator/src/main/resources/synapse-configuration-migrator.xslt Wed Jul 28 16:29:34 2010
@@ -32,7 +32,7 @@ This is the synapse migration xslt which
<xsl:call-template name="convertNS"/>
</xsl:template>
- <xsl:template match="syn:definitions/syn:sequence | syn:definitions/syn:localEntry | syn:definitions/syn:proxy | syn:definitions/syn:task | syn:definitions/syn:endpoint | syn:definitions/syn:registry" priority="2">
+ <xsl:template match="syn:definitions/syn:sequence | syn:definitions/syn:localEntry | syn:definitions/syn:proxy | syn:definitions/syn:task | syn:definitions/syn:endpoint | syn:definitions/syn:eventSource | syn:definitions/syn:registry" priority="2">
<xsl:call-template name="convertNS"/>
</xsl:template>
@@ -42,26 +42,26 @@ This is the synapse migration xslt which
</xsl:text>
<xsl:for-each select="syn:* | synNew:* | comment()">
- <xsl:if test="local-name()='sequence' or local-name()='localEntry' or local-name()='proxy' or local-name()='task' or local-name()='endpoint' or local-name()='registry'">
+ <xsl:if test="local-name()='sequence' or local-name()='localEntry' or local-name()='proxy' or local-name()='task' or local-name()='endpoint' or local-name()='eventSource' or local-name()='registry'">
<xsl:apply-templates select="."/>
<xsl:text>
</xsl:text>
</xsl:if>
- <xsl:if test="self::comment() and (local-name(following-sibling::*[position()=1])='localEntry' or local-name(following-sibling::*[position()=1])='proxy' or local-name(following-sibling::*[position()=1])='task' or local-name(following-sibling::*[position()=1])='sequence' or local-name(following-sibling::*[position()=1])='endpoint' or local-name(following-sibling::*[position()=1])='registry')">
+ <xsl:if test="self::comment() and (local-name(following-sibling::*[position()=1])='localEntry' or local-name(following-sibling::*[position()=1])='proxy' or local-name(following-sibling::*[position()=1])='task' or local-name(following-sibling::*[position()=1])='sequence' or local-name(following-sibling::*[position()=1])='endpoint' or local-name(following-sibling::*[position()=1])='eventSource' or local-name(following-sibling::*[position()=1])='registry')">
<xsl:copy-of select="self::comment()" xml:space="preserve"/>
<xsl:text>
</xsl:text>
</xsl:if>
</xsl:for-each>
- <xsl:if test="not(syn:sequence[@name='main'] or synNew:sequence[@name='main']) and (count(syn:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='registry']) + count(synNew:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='registry']))!=0">
+ <xsl:if test="not(syn:sequence[@name='main'] or synNew:sequence[@name='main']) and (count(syn:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='registry']) + count(synNew:*[local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='registry']))!=0">
<xsl:element name="sequence" namespace="http://synapse.apache.org/ns/2010/04/configuration">
<xsl:attribute name="name">main</xsl:attribute>
<xsl:for-each select="syn:* | synNew:* | comment()">
- <xsl:if test="local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='registry'">
+ <xsl:if test="local-name()!='sequence' and local-name()!='localEntry' and local-name()!='proxy' and local-name()!='task' and local-name()!='endpoint' and local-name()!='eventSource' and local-name()!='registry'">
<xsl:choose>
<xsl:when test="self::comment()">
- <xsl:if test="local-name(following-sibling::*[position()=1])!='localEntry' and local-name(following-sibling::*[position()=1])!='sequence' and local-name(following-sibling::*[position()=1])!='proxy' and local-name(following-sibling::*[position()=1])!='task' and local-name(following-sibling::*[position()=1])!='endpoint' and local-name(following-sibling::*[position()=1])!='registry'">
+ <xsl:if test="local-name(following-sibling::*[position()=1])!='localEntry' and local-name(following-sibling::*[position()=1])!='sequence' and local-name(following-sibling::*[position()=1])!='proxy' and local-name(following-sibling::*[position()=1])!='task' and local-name(following-sibling::*[position()=1])!='endpoint' and local-name(following-sibling::*[position()=1])!='eventSource' and local-name(following-sibling::*[position()=1])!='registry'">
<xsl:copy-of select="self::comment()" xml:space="preserve"/>
</xsl:if>
</xsl:when>
Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_500.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_500.xml?rev=980116&r1=980115&r2=980116&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_500.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_500.xml Wed Jul 28 16:29:34 2010
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -19,22 +20,25 @@
<!-- Simple Eventing configuration -->
<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration">
- <eventSource name="SampleEventSource">
- <subscriptionManager class="org.apache.synapse.eventing.managers.DefaultInMemorySubscriptionManager">
- <!--property name="registryURL" value="http://localhost:8180/wso2registry"/>
- <property name="username" value="admin"/>
- <property name="password" value="admin"/-->
- <property name="topicHeaderName" value="Topic"/>
- <property name="topicHeaderNS" value="http://apache.org/aip"/>
- </subscriptionManager>
- </eventSource>
- <sequence name="PublicEventSource" >
- <log level="full"/>
- <eventPublisher eventSourceName="SampleEventSource"/>
+ <eventSource name="SampleEventSource">
+ <subscriptionManager
+ class="org.apache.synapse.eventing.managers.DefaultInMemorySubscriptionManager">
+ <!--property name="registryURL" value="http://localhost:8180/wso2registry"/>
+ <property name="username" value="admin"/>
+ <property name="password" value="admin"/-->
+ <property name="topicHeaderName" value="Topic"/>
+ <property name="topicHeaderNS" value="http://apache.org/aip"/>
+ </subscriptionManager>
+ </eventSource>
+
+ <sequence name="PublicEventSource">
+ <log level="full"/>
+ <eventPublisher eventSourceName="SampleEventSource"/>
</sequence>
<proxy name="EventingProxy">
- <target inSequence="PublicEventSource" />
+ <target inSequence="PublicEventSource"/>
</proxy>
-</definitions>
\ No newline at end of file
+
+</definitions>