Author: asankha
Date: Tue Mar 6 01:46:57 2007
New Revision: 515046
URL: http://svn.apache.org/viewvc?view=rev&rev=515046
Log:
fix unit tests for core module
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml
webservices/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/Constants.java
Tue Mar 6 01:46:57 2007
@@ -32,8 +32,6 @@
public static final QName REGISTRY_ELT = new
QName(Constants.SYNAPSE_NAMESPACE, "registry");
public static final QName PROXY_ELT = new
QName(Constants.SYNAPSE_NAMESPACE, "proxy");
- public static final String FAULT_SEQUENCE = "fault";
-
public static final String SYNAPSE_NAMESPACE =
org.apache.synapse.Constants.SYNAPSE_NAMESPACE;
public static final String NULL_NAMESPACE = "";
public static final String RAMPART_POLICY = "rampartPolicy";
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
Tue Mar 6 01:46:57 2007
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.Mediator;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.config.Entry;
import org.apache.synapse.config.xml.endpoints.EndpointAbstractFactory;
@@ -52,6 +53,9 @@
log.info("Generating the Synapse configuration model by parsing the
XML configuration");
SynapseConfiguration config = new SynapseConfiguration();
+ SequenceMediator rootSequence = new SequenceMediator();
+ rootSequence.setName(org.apache.synapse.Constants.MAIN_SEQUENCE_KEY);
+
OMElement definitions = null;
try {
definitions = new StAXOMBuilder(is).getDocumentElement();
@@ -74,7 +78,8 @@
} else if (Constants.REGISTRY_ELT.equals(elt.getQName())) {
defineRegistry(config, elt);
} else {
- handleException("Unexpected element : " +
elt.getQName());
+ Mediator m =
MediatorFactoryFinder.getInstance().getMediator(elt);
+ rootSequence.addChild(m);
}
}
}
@@ -90,7 +95,11 @@
}
if (config.getMainSequence() == null) {
- setDefaultMainSequence(config);
+ if (rootSequence.getList().isEmpty()) {
+ setDefaultMainSequence(config);
+ } else {
+ config.addSequence(rootSequence.getName(), rootSequence);
+ }
}
if (config.getFaultSequence() == null) {
@@ -160,6 +169,7 @@
SequenceMediator main = new SequenceMediator();
main.setName(org.apache.synapse.Constants.MAIN_SEQUENCE_KEY);
main.addChild(new SendMediator());
+ config.addSequence(org.apache.synapse.Constants.MAIN_SEQUENCE_KEY,
main);
}
/**
@@ -173,6 +183,7 @@
LogMediator log = new LogMediator();
log.setLogLevel(LogMediator.FULL);
fault.addChild(log);
+ config.addSequence(org.apache.synapse.Constants.FAULT_SEQUENCE_KEY,
fault);
}
private static void handleException(String msg) {
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/RegistrySerializationTest.java
Tue Mar 6 01:46:57 2007
@@ -35,7 +35,7 @@
public void testRegistrySerialization() {
- String regitryConfiguration = "<syn:registry
xmlns:syn=\"http://ws.apache.org/ns/synapse\";
provider=\"org.apache.synapse.registry.url.SimpleURLRegistry\"
name=\"myregistry\">" +
+ String regitryConfiguration = "<syn:registry
xmlns:syn=\"http://ws.apache.org/ns/synapse\";
provider=\"org.apache.synapse.registry.url.SimpleURLRegistry\">" +
"<syn:property name=\"root\"
value=\"file:./../../repository/\"/>" +
"<syn:property name=\"cachableDuration\" value=\"15000\"/>" +
"</syn:registry>";
Modified:
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SequenceMediatorSerializationTest.java
Tue Mar 6 01:46:57 2007
@@ -45,7 +45,7 @@
}
public void testSequenceMediatorSerializationSenarioThree() throws
Exception {
- String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\";
ref=\"sequenceone\"></sequence>";
+ String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\";
key=\"sequenceone\"></sequence>";
assertTrue(serialization(xml, sequenceMediatorFactory,
sequenceMediatorSerializer));
assertTrue(serialization(xml, sequenceMediatorSerializer));
}
@@ -57,7 +57,7 @@
}
public void testSequenceMediatorSerializationSenarioFive() throws
Exception {
- String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\";
ref=\"sequenceone\" ></sequence>";
+ String xml = "<sequence xmlns=\"http://ws.apache.org/ns/synapse\";
key=\"sequenceone\" ></sequence>";
assertTrue(serialization(xml, sequenceMediatorFactory,
sequenceMediatorSerializer));
assertTrue(serialization(xml, sequenceMediatorSerializer));
}
Modified:
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
(original)
+++
webservices/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/TestMessageContext.java
Tue Mar 6 01:46:57 2007
@@ -259,13 +259,6 @@
public void setTracingState(int tracingState) {
}
- public Stack getFaultStack() {
- return null;
- }
-
- public void pushFault(FaultHandler fault) {
- }
-
public MessageContext getSynapseContext() {
return null;
}
Modified:
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/synapse.xml
Tue Mar 6 01:46:57 2007
@@ -17,27 +17,19 @@
~ under the License.
-->
-<synapse xmlns="http://ws.apache.org/ns/synapse";>
-
- <definitions>
+<definitions xmlns="http://ws.apache.org/ns/synapse";>
<sequence name="commodityQuote">
- <!-- set the To address to the real endpoint -->
- <header name="To"
value="http://127.0.0.1:10001/axis2/services/Services"/>
- <header name="Action" value="urn:commodity"/>
-
+ <!-- set the To address to the real endpoint -->
+ <header name="To"
value="http://127.0.0.1:10001/axis2/services/Services"/>
+ <header name="Action" value="urn:commodity"/>
</sequence>
- </definitions>
-
- <rules>
-
<!-- Check if the URL matches the stockquote gateway/dumb case -->
<filter source="get-property('To')" regex=".*/CommodityQuote.*">
- <sequence ref="commodityQuote"/>
+ <sequence key="commodityQuote"/>
</filter>
<send/>
- </rules>
-</synapse>
\ No newline at end of file
+</definitions>
\ No newline at end of file
Modified:
webservices/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml?view=diff&rev=515046&r1=515045&r2=515046
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/resources/spring/synapse_spring_unittest.xml
Tue Mar 6 01:46:57 2007
@@ -24,14 +24,9 @@
<property name="cachableDuration" value="15000"/>
</registry>
- <definitions>
- <set-property name="springconfig1"
key="conf/sample/resources/spring/springsample.xml"/>
- <set-property name="springconfig2"
src="file:./../../repository/conf/sample/resources/spring/springsample.xml"/>
- </definitions>
+ <localEntry key="springconfig2"
src="file:./../../repository/conf/sample/resources/spring/springsample.xml"/>
- <rules>
- <spring:spring bean="springtest" key="springconfig1"/>
+ <spring:spring bean="springtest"
key="conf/sample/resources/spring/springsample.xml"/>
<spring:spring bean="springtest" key="springconfig2"/>
- </rules>
</synapse>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
