Author: asankha
Date: Mon Jun 19 04:00:51 2006
New Revision: 415289
URL: http://svn.apache.org/viewvc?rev=415289&view=rev
Log:
remove unused and deprecated mediators modules
remove duplicate TestUtils and TestMessageContext classes and add a hack to get
these from the test source of core module
Removed:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestMessageContext.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TestUtils.java
incubator/synapse/trunk/java/modules/mediators/
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java
incubator/synapse/trunk/java/modules/extensions/project.xml
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TransformMediatorTest.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/JsonMediatorTest.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringMediatorTest.java
Modified:
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java
(original)
+++
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/TestUtils.java
Mon Jun 19 04:00:51 2006
@@ -16,10 +16,15 @@
package org.apache.synapse.mediators;
import org.apache.synapse.TestMessageContext;
+import org.apache.synapse.MessageContext;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.synapse.core.axis2.Axis2SynapseEnvironment;
+import org.apache.synapse.core.axis2.Axis2MessageContext;
+import org.apache.synapse.core.SynapseEnvironment;
+import org.apache.synapse.config.SynapseConfiguration;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
@@ -45,5 +50,28 @@
synCtx.setEnvelope(envelope);
return synCtx;
+ }
+ public static MessageContext createLightweightSynapseMessageContext(
+ String paylod) throws Exception {
+ org.apache.axis2.context.MessageContext mc =
+ new org.apache.axis2.context.MessageContext();
+ SynapseConfiguration config = new SynapseConfiguration();
+ SynapseEnvironment env = new Axis2SynapseEnvironment();
+ MessageContext synMc = new Axis2MessageContext(mc,config,env);
+ SOAPEnvelope envelope =
+ OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ OMDocument omDoc =
+ OMAbstractFactory.getSOAP11Factory().createOMDocument();
+ omDoc.addChild(envelope);
+
+ XMLStreamReader parser = XMLInputFactory.newInstance().
+ createXMLStreamReader(new StringReader(paylod));
+ StAXOMBuilder builder = new StAXOMBuilder(parser);
+
+ // set a dummy static message
+ envelope.getBody().addChild(builder.getDocumentElement());
+
+ synMc.setEnvelope(envelope);
+ return synMc;
}
}
Modified: incubator/synapse/trunk/java/modules/extensions/project.xml
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/project.xml?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/extensions/project.xml (original)
+++ incubator/synapse/trunk/java/modules/extensions/project.xml Mon Jun 19
04:00:51 2006
@@ -61,17 +61,24 @@
<nagEmailAddress>[email protected]</nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
<unitTestSourceDirectory>test</unitTestSourceDirectory>
+
<unitTest>
<includes>
- <include>**/*Test.java</include>
+ <include>**/*Test.java</include>
</includes>
-
+
<resources>
<resource>
<directory>src</directory>
<includes>
<include>**/org.apache.synapse.config.xml.MediatorFactory</include>
<include>**/org.apache.synapse.config.xml.ExtensionFactory</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>./../core/target/test-classes</directory>
+ <includes>
+ <include>**/*</include>
</includes>
</resource>
</resources>
Modified:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TransformMediatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TransformMediatorTest.java?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TransformMediatorTest.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/TransformMediatorTest.java
Mon Jun 19 04:00:51 2006
@@ -19,7 +19,7 @@
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
-import org.apache.synapse.TestUtils;
+import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.transform.TransformMediator;
import org.apache.synapse.MessageContext;
Modified:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/ValidateMediatorTest.java
Mon Jun 19 04:00:51 2006
@@ -20,7 +20,7 @@
import org.apache.synapse.MessageContext;
import org.apache.synapse.TestMediateHandler;
import org.apache.synapse.TestMediator;
-import org.apache.synapse.TestUtils;
+import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.mediators.ValidateMediator;
public class ValidateMediatorTest extends TestCase {
Modified:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/JsonMediatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/JsonMediatorTest.java?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/JsonMediatorTest.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/JsonMediatorTest.java
Mon Jun 19 04:00:51 2006
@@ -3,7 +3,7 @@
import junit.framework.TestCase;
import org.apache.synapse.mediators.ext.json.JsonMediator;
import org.apache.synapse.MessageContext;
-import org.apache.synapse.TestUtils;
+import org.apache.synapse.mediators.TestUtils;
import org.apache.synapse.core.axis2.Axis2MessageContext;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Modified:
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringMediatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringMediatorTest.java?rev=415289&r1=415288&r2=415289&view=diff
==============================================================================
---
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringMediatorTest.java
(original)
+++
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/SpringMediatorTest.java
Mon Jun 19 04:00:51 2006
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.apache.synapse.MessageContext;
import org.apache.synapse.config.SynapseConfigurationBuilder;
-import org.apache.synapse.TestUtils;
+import org.apache.synapse.mediators.TestUtils;
import java.io.FileInputStream;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
