Author: hiranya
Date: Fri May 7 08:53:33 2010
New Revision: 942037
URL: http://svn.apache.org/viewvc?rev=942037&view=rev
Log:
Updated the multi xml config builder test
Added:
synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml
synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java?rev=942037&r1=942036&r2=942037&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilderTest.java
Fri May 7 08:53:33 2010
@@ -24,6 +24,8 @@ import junit.framework.TestCase;
import java.net.URL;
import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.mediators.base.SequenceMediator;
+import org.apache.axis2.util.JavaUtils;
import javax.xml.stream.XMLStreamException;
@@ -40,14 +42,24 @@ public class MultiXMLConfigurationBuilde
assertNotNull(synapseConfig.getDefinedSequences().get("main"));
assertNotNull(synapseConfig.getDefinedSequences().get("fault"));
- assertNotNull(synapseConfig.getDefinedSequences().get("foo"));
+ SequenceMediator foo =
synapseConfig.getDefinedSequences().get("foo");
+ SequenceMediator seq1 =
synapseConfig.getDefinedSequences().get("synapse_xml_seq1");
+ assertNotNull(foo);
+ assertNotNull(seq1);
+ assertEquals("foo.xml", foo.getFileName());
+ assertNull(seq1.getFileName());
assertNull(synapseConfig.getDefinedSequences().get("bar"));
-
+
assertNotNull(synapseConfig.getDefinedEndpoints().get("epr1"));
+
assertNotNull(synapseConfig.getDefinedEndpoints().get("synapse_xml_epr1"));
assertNotNull(synapseConfig.getProxyService("proxy1"));
assertNotNull(synapseConfig.getStartup("task1"));
+
+ assertNotNull(synapseConfig.getRegistry());
+ assertTrue(JavaUtils.isTrueExplicitly(synapseConfig.getProperty(
+
MultiXMLConfigurationBuilder.SEPARATE_REGISTRY_DEFINITION)));
} catch (XMLStreamException e) {
fail("Error while parsing a configuration file: " +
e.getMessage());
Added:
synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml?rev=942037&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml
(added)
+++
synapse/trunk/java/modules/core/src/test/resources/synapse-config/registry.xml
Fri May 7 08:53:33 2010
@@ -0,0 +1,5 @@
+<registry xmlns="http://synapse.apache.org/ns/2010/04/configuration";
+ provider="org.apache.synapse.registry.url.SimpleURLRegistry">
+ <parameter name="root">file:repository/conf/sample/resources/</parameter>
+ <parameter name="cachableDuration">15000</parameter>
+</registry>
\ No newline at end of file
Added:
synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml?rev=942037&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml
(added)
+++
synapse/trunk/java/modules/core/src/test/resources/synapse-config/synapse.xml
Fri May 7 08:53:33 2010
@@ -0,0 +1,12 @@
+<definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration";>
+
+ <endpoint name="synapse_xml_epr1">
+ <address uri="http://localhost:8080/services/Test"/>
+ </endpoint>
+
+ <sequence name="synapse_xml_seq1">
+ <log/>
+ <drop/>
+ </sequence>
+
+</definitions>
\ No newline at end of file
