You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by sa...@apache.org on 2006/03/26 13:03:30 UTC
svn commit: r388894 [1/3] - in /incubator/synapse/trunk/java: etc/
modules/core/ modules/core/src/org/apache/synapse/
modules/core/src/org/apache/synapse/axis2/
modules/core/src/org/apache/synapse/processors/builtin/
modules/core/src/org/apache/synapse...
Author: saminda
Date: Sun Mar 26 03:03:22 2006
New Revision: 388894
URL: http://svn.apache.org/viewcvs?rev=388894&view=rev
Log:
Synapse core has been upgraded to cope with latest releases of Axis2, Axiom and Policy.
Synapse runs on following SNAPSHOT dependencies,
1.Axis2-SNAPSHOT {Axis2-0.95 and latest}
2.Axiom-SNAPSHOT
3.Policy-SNAPSHOT
4.XmlSchema-SNAPSHOT
5.WSS4J-SNAPSHOT
Processing architecture of AddressingInProcessor changed to cope with the availability of module engagement and
disengagement.
Added AddressionOutMediator. This mediator will engage or disengage addressing on outbound messages.
Added addressing-0.95.mar and removed addressing-0.94.mar.
Updated axis2.xml. By default no modules being engaged. If need to be engaged it has to be handle at Mediator level.
Updated all maven.xml's, project.xml's and project.properties.
TODO:
Need to check all the .sh files and .bat files.
Need to run samples.
Need to verify the state of added mediators.
Added:
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingOutMediator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingOutMediatorFactory.java
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/axis2.xml
incubator/synapse/trunk/java/modules/core/test-resources/axis2/conf/synapse.xml
- copied unchanged from r387850, incubator/synapse/trunk/java/modules/core/test-resources/axis2/synapse.xml
incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/
incubator/synapse/trunk/java/modules/core/test-resources/rest/conf/axis2-rest.xml
incubator/synapse/trunk/java/modules/core/test-resources/tcp/
incubator/synapse/trunk/java/modules/core/test-resources/tcp/axis2-tcp.xml
incubator/synapse/trunk/java/repository/conf/
incubator/synapse/trunk/java/repository/conf/axis2.xml
incubator/synapse/trunk/java/repository/conf/synapse.xml
- copied unchanged from r387850, incubator/synapse/trunk/java/repository/synapse.xml
incubator/synapse/trunk/java/repository/modules/addressing-0.95.mar (with props)
Removed:
incubator/synapse/trunk/java/modules/core/test-resources/axis2/axis2.xml
incubator/synapse/trunk/java/modules/core/test-resources/axis2/synapse.xml
incubator/synapse/trunk/java/modules/core/test-resources/rest/axis2-rest.xml
incubator/synapse/trunk/java/repository/axis2.xml
incubator/synapse/trunk/java/repository/modules/addressing-0.94.mar
incubator/synapse/trunk/java/repository/synapse.xml
Modified:
incubator/synapse/trunk/java/etc/project.properties
incubator/synapse/trunk/java/etc/project.xml
incubator/synapse/trunk/java/modules/core/maven.xml
incubator/synapse/trunk/java/modules/core/project.xml
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseEnvironment.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseMessage.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/DynamicAxisOperation.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/SendNowProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/SecurityProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/DefaultProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/ExactlyOneProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/rules/XPathProcessor.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHandler.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelper.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelperImpl.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/http/SimpleGETResourceHandler.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/PropertyMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/ResourceMediatorFactory.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractListProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AbstractProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/AddressingProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ClassMediatorProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DefineProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/DropProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/FaultProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/HeaderProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/InProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/LogProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/NeverProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/OutProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ProcessorConfiguratorFinder.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefDefineProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RefProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/RegexProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SecurityProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendNowProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SendProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/ServiceMediatorProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/StageProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/SynapseProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/xml/XPathProcessorConfigurator.java
incubator/synapse/trunk/java/modules/core/test-resources/org/apache/axis2/META-INF/services.xml
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/ExceptionHandlingTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/MultipleAddressingModuleEngagementTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/axis2/test/Echo.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/TestSynapseMessage.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/environment/EnvironmentAwareTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/LoggerTestSample.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/mediators/SimpleGETResourceAquiringMediator.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/conditions/ExactlyOneProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/AddressingProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ClassMediatorProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/DefineProcessorwithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/HTTPToTCPMessageMediationTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/RegexProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendNowProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithAddressingEngageWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithAddressingEnageWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/ServiceMediatorProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/injection/XpathProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/processors/FaultProcessorTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/spi/resources/SimpleResourcesAquiringTest.java
incubator/synapse/trunk/java/modules/core/test/org/apache/synapse/util/Axis2EnvSetup.java
incubator/synapse/trunk/java/modules/core/test/rules/synapse-sendon.xml
incubator/synapse/trunk/java/modules/extensions/project.xml
incubator/synapse/trunk/java/modules/extensions/src/META-INF/services/org.apache.synapse.xml.ProcessorConfigurator
incubator/synapse/trunk/java/modules/extensions/src/org/apache/synapse/processors/mediatortypes/spring/SpringMediatorProcessorConfigurator.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/extensions/utils/Axis2EnvSetup.java
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spi/injection/SpringMediatorProcessorWithRuleTest.java
incubator/synapse/trunk/java/modules/mediators/project.xml
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/deprecation/DeprecationConfigurator.java
incubator/synapse/trunk/java/modules/mediators/src/org/apache/synapse/mediators/sla/SLAConfigurator.java
incubator/synapse/trunk/java/modules/samples/src/sampleMediators/Logger.java
incubator/synapse/trunk/java/modules/samples/src/samples/userguide/DumbStockQuoteClient.java
incubator/synapse/trunk/java/modules/samples/src/samples/userguide/ProxyStockQuoteClient.java
incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteClient.java
incubator/synapse/trunk/java/modules/samples/src/samples/userguide/StockQuoteXMLHandler.java
incubator/synapse/trunk/java/modules/samples/src/samples/userguide/log/LoggingClient.java
Modified: incubator/synapse/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/etc/project.properties?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/etc/project.properties (original)
+++ incubator/synapse/trunk/java/etc/project.properties Sun Mar 26 03:03:22 2006
@@ -32,8 +32,11 @@
# -------------------------------------------------------------------
ant.version=1.6.5
axis.wsdl4j.version=1.2
-axis2.version=0.94
+axis2.version=SNAPSHOT
axiom.version=SNAPSHOT
+policy.version=SNAPSHOT
+XmlSchema.version=SNAPSHOT
+wss4j.version=SNAPSHOT
commons.codec.version=1.3
commons.discovery.version=0.2
commons.httpclient.version=3.0
@@ -51,13 +54,10 @@
stax.impl.groupid=woodstox
stax.impl.artifactid=wstx
stax.impl.version=asl-2.8.1
-wss4j.version=SNAPSHOT
xalan.version=2.6.0
xerces.version=2.6.2
-XmlSchema.version=1.0-SNAPSHOT
xmlunit.version=1.0
annogen.version=0.1.0
-policy.version=SNAPSHOT
geronimo.spec.jms.version=1.1-rc4
backport_util_concurrent.version=2.0_01_pd
spring.version=1.2.6
@@ -78,4 +78,4 @@
# -------------------------------------------------------------------
# Addressing Version
# -------------------------------------------------------------------
-addressing.version=0.94
+addressing.version=0.95
Modified: incubator/synapse/trunk/java/etc/project.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/etc/project.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/etc/project.xml (original)
+++ incubator/synapse/trunk/java/etc/project.xml Sun Mar 26 03:03:22 2006
@@ -58,9 +58,45 @@
<dependencies>
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
+ <artifactId>axis2</artifactId>
<version>${axis2.version}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>axis2</groupId>-->
+ <!--<artifactId>axis2-common</artifactId>-->
+ <!--<version>${axis2.version}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>axis2</groupId>-->
+ <!--<artifactId>axis2-wsdl</artifactId>-->
+ <!--<version>${axis2.version}</version>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
+ <version>${policy.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>axiom</artifactId>
+ <version>${axiom.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
@@ -186,27 +222,7 @@
<module>true</module>
</properties>
</dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>${policy.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
+
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
Modified: incubator/synapse/trunk/java/modules/core/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/maven.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/maven.xml (original)
+++ incubator/synapse/trunk/java/modules/core/maven.xml Sun Mar 26 03:03:22 2006
@@ -86,10 +86,10 @@
<mkdir dir="target/synapse-repository-sendon/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-sendon/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-sendon/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-sendon/conf/axis2.xml"/>
<copy file="test/rules/synapse-sendon.xml"
- tofile="target/synapse-repository-sendon/synapse.xml"/>
+ tofile="target/synapse-repository-sendon/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - SendNow ----------"/>
@@ -103,10 +103,10 @@
<mkdir dir="target/synapse-repository-sendnow/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-sendnow/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-sendnow/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-sendnow/conf/axis2.xml"/>
<copy file="test/rules/synapse-sendnow.xml"
- tofile="target/synapse-repository-sendnow/synapse.xml"/>
+ tofile="target/synapse-repository-sendnow/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - SendOnAxis2 ----------"/>
<mkdir dir="target/synapse-repository-sendonAxis2"/>
@@ -119,8 +119,8 @@
tofile="target/synapse-repository-sendonAxis2/services/emptymediator.aar"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-sendonAxis2/modules/addressing-${addressing.version}.mar"/>
- <copy file="test-resources/axis2/axis2.xml"
- tofile="target/synapse-repository-sendonAxis2/axis2.xml"/>
+ <copy file="test-resources/axis2/conf/axis2.xml"
+ tofile="target/synapse-repository-sendonAxis2/conf/axis2.xml"/>
<echo message="-----------Creating Testing Repository - SendonAxis2Tcp ----------"/>
<mkdir dir="target/synapse-repository-sendonAxis2"/>
@@ -129,8 +129,8 @@
tofile="target/synapse-repository-sendonAxis2Tcp/services/npe.aar"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-sendonAxis2Tcp/modules/addressing-${addressing.version}.mar"/>
- <copy file="test-resources/axis2/axis2.xml"
- tofile="target/synapse-repository-sendonAxis2Tcp/axis2.xml"/>
+ <copy file="test-resources/tcp/axis2-tcp.xml"
+ tofile="target/synapse-repository-sendonAxis2Tcp/conf/axis2.xml"/>
<echo message="-----------Creating Testing Repository - HttpTcp ----------"/>
<mkdir dir="target/synapse-repository-httptcp"/>
@@ -141,10 +141,10 @@
tofile="target/synapse-repository-httptcp/services/synapse.aar"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-httptcp/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-httptcp/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-httptcp/conf/axis2.xml"/>
<copy file="test/rules/synapse-httptcp.xml"
- tofile="target/synapse-repository-httptcp/synapse.xml"/>
+ tofile="target/synapse-repository-httptcp/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - EnvironmentAware ----------"/>
<mkdir dir="target/synapse-repository-environmentaware"/>
@@ -157,10 +157,10 @@
tofile="target/synapse-repository-environmentaware/services/synapse.aar"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-environmentaware/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-environmentaware/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-environmentaware/conf/axis2.xml"/>
<copy file="test/rules/synapse-environmentaware.xml"
- tofile="target/synapse-repository-environmentaware/synapse.xml"/>
+ tofile="target/synapse-repository-environmentaware/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - Simple REST Repository ----------"/>
<mkdir dir="target/synapse-repository-resources"/>
@@ -169,8 +169,8 @@
tofile="target/synapse-repository-resources/services/npe.aar"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-resources/modules/addressing-${addressing.version}.mar"/>
- <copy file="test-resources/rest/axis2-rest.xml"
- tofile="target/synapse-repository-resources/axis2.xml"/>
+ <copy file="test-resources/rest/conf/axis2-rest.xml"
+ tofile="target/synapse-repository-resources/conf/axis2.xml"/>
<ant:delete file="target/npe.aar"/>
<ant:delete file="target/test-mediator.aar"/>
@@ -188,10 +188,10 @@
<mkdir dir="target/synapse-repository/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository/axis2.xml"/>
- <copy file="../../repository/synapse.xml"
- tofile="target/synapse-repository/synapse.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository/conf/axis2.xml"/>
+ <copy file="../../repository/conf/synapse.xml"
+ tofile="target/synapse-repository/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - Fault Handling ----------"/>
<mkdir dir="target/synapse-repository-fault"/>
@@ -202,10 +202,10 @@
<mkdir dir="target/synapse-repository-fault/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-fault/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-fault/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-fault/conf/axis2.xml"/>
<copy file="test/rules/synapse-fault-return.xml"
- tofile="target/synapse-repository-fault/synapse.xml"/>
+ tofile="target/synapse-repository-fault/conf/synapse.xml"/>
<echo message="-----------Creating Testing Repository - Send ----------"/>
<mkdir dir="target/synapse-repository-send"/>
@@ -216,10 +216,10 @@
<mkdir dir="target/synapse-repository-send/modules"/>
<copy file="../../repository/modules/addressing-${addressing.version}.mar"
tofile="target/synapse-repository-send/modules/addressing-${addressing.version}.mar"/>
- <copy file="../../repository/axis2.xml"
- tofile="target/synapse-repository-sendonAxis2/axis2.xml"/>
+ <copy file="../../repository/conf/axis2.xml"
+ tofile="target/synapse-repository-sendonAxis2/conf/axis2.xml"/>
<copy file="test/rules/synapse-send.xml"
- tofile="target/synapse-repository-send/synapse.xml"/>
+ tofile="target/synapse-repository-send/conf/synapse.xml"/>
<ant:delete dir="target/modules"/>
<ant:delete dir="target/services"/>
Modified: incubator/synapse/trunk/java/modules/core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/project.xml?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/project.xml (original)
+++ incubator/synapse/trunk/java/modules/core/project.xml Sun Mar 26 03:03:22 2006
@@ -13,165 +13,8 @@
<!-- Dependencies -->
<!-- ============ -->
- <dependencies>
- <!-- external JARs -->
- <dependency>
- <groupId>axis2</groupId>
- <artifactId>axis2-core</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${commons.httpclient.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>${commons.discovery.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons.codec.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifactid}</artifactId>
- <version>${stax.impl.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax.api.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-wsdl4j</artifactId>
- <version>${axis.wsdl4j.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>${geronimo.spec.javamail.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo.spec.activation.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- <version>${geronimo.spec.jms.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <properties>
- <classloader>root</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.6.0</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${XmlSchema.version}</version>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>policy</artifactId>
- <version>${policy.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>ws-commons</groupId>
- <artifactId>axiom</artifactId>
- <version>${axiom.version}</version>
- <properties>
- <module>false</module>
- </properties>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- <properties>
- <module>true</module>
- </properties>
- </dependency>
- </dependencies>
-
+ <dependencies/>
+
<build>
<nagEmailAddress>synapse-dev@ws.apache.org</nagEmailAddress>
<sourceDirectory>src</sourceDirectory>
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/Constants.java Sun Mar 26 03:03:22 2006
@@ -53,9 +53,9 @@
// addressing properites handling
- String ADDRESSING_PROCESSED = "__ADDRESSING_PROCESSED";
+ String ENGAGE_ADDRESSING_IN_MESSAGE = "__ENGAGE_ADDRESSING_IN_MESSAGE__";
+
+ String ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE = "__ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE__";
- // transport header selection
- String OK_200 = "200_OK";
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseEnvironment.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseEnvironment.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseEnvironment.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseEnvironment.java Sun Mar 26 03:03:22 2006
@@ -15,7 +15,6 @@
*/
package org.apache.synapse;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.resources.ResourceHelper;
import java.util.Map;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseMessage.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseMessage.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/SynapseMessage.java Sun Mar 26 03:03:22 2006
@@ -19,7 +19,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPEnvelope;
/**
*
@@ -35,63 +35,63 @@
*/
public interface SynapseMessage {
- public EndpointReference getFaultTo();
+ public EndpointReference getFaultTo();
- public void setFaultTo(EndpointReference reference);
+ public void setFaultTo(EndpointReference reference);
- public EndpointReference getFrom();
+ public EndpointReference getFrom();
- public void setFrom(EndpointReference reference);
+ public void setFrom(EndpointReference reference);
- public SOAPEnvelope getEnvelope();
+ public SOAPEnvelope getEnvelope();
- public void setEnvelope(SOAPEnvelope envelope) throws AxisFault;
+ public void setEnvelope(SOAPEnvelope envelope) throws AxisFault;
- public String getMessageID();
+ public String getMessageID();
- public void setMessageID(String string);
+ public void setMessageID(String string);
- public RelatesTo getRelatesTo();
+ public RelatesTo getRelatesTo();
- public void setRelatesTo(RelatesTo reference);
+ public void setRelatesTo(RelatesTo reference);
- public EndpointReference getReplyTo();
+ public EndpointReference getReplyTo();
- public void setReplyTo(EndpointReference reference);
+ public void setReplyTo(EndpointReference reference);
- public EndpointReference getTo();
+ public EndpointReference getTo();
- public void setTo(EndpointReference reference);
+ public void setTo(EndpointReference reference);
- public void setWSAAction(String actionURI);
+ public void setWSAAction(String actionURI);
- public String getWSAAction();
+ public String getWSAAction();
- public void setMessageId(String messageID);
+ public void setMessageId(String messageID);
- public String getMessageId();
+ public String getMessageId();
- public Object getProperty(String key);
+ public Object getProperty(String key);
- public void setProperty(String key, Object value);
+ public void setProperty(String key, Object value);
- public String getSoapAction();
+ public String getSoapAction();
- public void setSoapAction(String string);
+ public void setSoapAction(String string);
- public boolean isDoingMTOM();
+ public boolean isDoingMTOM();
- public void setDoingMTOM(boolean b);
+ public void setDoingMTOM(boolean b);
- public boolean isDoingREST();
+ public boolean isDoingREST();
- public void setDoingREST(boolean b);
+ public void setDoingREST(boolean b);
- public boolean isSOAP11();
+ public boolean isSOAP11();
- public void setResponse(boolean b);
+ public void setResponse(boolean b);
- public boolean isResponse();
+ public boolean isResponse();
public void setFaultResponse(boolean b);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java Sun Mar 26 03:03:22 2006
@@ -24,10 +24,6 @@
import org.apache.axis2.description.*;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
-import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.AxisFault;
@@ -37,6 +33,9 @@
import org.apache.synapse.Constants;
import org.apache.wsdl.WSDLConstants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import javax.xml.namespace.QName;
@@ -103,7 +102,7 @@
phasesInfo.setOperationPhases(outInOperation);
}
ServiceGroupContext sgc = new ServiceGroupContext(cc,
- ac.getService("__ANONYMOUS_SERVICE__").getParent());
+ (AxisServiceGroup)ac.getService("__ANONYMOUS_SERVICE__").getParent());
ServiceContext sc =
sgc.getServiceContext(new AxisService("__ANONYMOUS_SERVICE__"));
@@ -135,13 +134,24 @@
if (smc.isDoingREST()) {
mc.setDoingREST(true);
}
- if (smc.getProperty(
- org.apache.axis2.Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES) !=
- null) {
- mc.setProperty(
- org.apache.axis2.Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
- Boolean.TRUE);
+
+ // handling the outbound message with addressing
+ AxisModule module = ac.getModule(new QName("addressing")) ;
+ if ((smc.getProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE) != null) ||
+ (smc.getProperty(
+ Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE) != null)){
+// if (!ac.isEngaged(new QName("addressing")))
+// ac.engageModule(new QName("addressing"));
+
+ if (!ac.getService("__ANONYMOUS_SERVICE__")
+ .isEngaged(module.getName())) {
+ ac.getService("__ANONYMOUS_SERVICE__").engageModule(module, ac);
+ }
+//
}
+
+
+ //TODO; following line needed to be removed
mc.setEnvelope(outEnvelopeConfiguration(smc));
///////////////////////////////////////////////////////////////////////
@@ -167,8 +177,18 @@
// If request is REST we assume the response is REST, so set the
// variable
response.setDoingREST(smc.isDoingREST());
- response.setProperty(Constants.ISRESPONSE_PROPERTY, new Boolean(
- true));
+ response.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
+
+ // disengae addressing if engage - mandatory
+ //TODO: temporary solution
+// if (ac.isEngaged(new QName("addressing"))) {
+// ac.disEngageModule(ac.getModule(new QName("addressing")));
+// }
+ if (ac.getService("__ANONYMOUS_SERVICE__")
+ .isEngaged(module.getName())) {
+ ac.getService("__ANONYMOUS_SERVICE__")
+ .disEngageModule(ac.getModule(module.getName()));
+ }
return response;
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.java Sun Mar 26 03:03:22 2006
@@ -17,23 +17,22 @@
package org.apache.synapse.axis2;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAP12Constants;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMNamespace;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.SynapseEnvironment;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMNamespace;
import java.util.Iterator;
@@ -49,15 +48,24 @@
MessageContext messageContext = ((Axis2SynapseMessage) smc)
.getMessageContext();
- // runtime switch between AddressingOutProcessor.
- // By default addressing is engaged. At runtime we check
- // SynapseEnvironemnt, whether Addressing engaged. If not using the following code
- // ar runtime Synapse will desable Axis2's AddressingOutHandler
- if (se.getProperty(Constants.ADDRESSING_PROCESSED) == null) {
- messageContext
- .setProperty(
- org.apache.axis2.Constants.Configuration.DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
- Boolean.TRUE);
+ // At any time any QOS is disengaged. It's engaged iff, a flag is
+ // set in execution chain.
+ // ex: addressing will be engage in outpath iff ADDRESSING_PROCESSED
+ // is set.
+
+ if (smc.getProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE) != null)
+ {
+ messageContext.setProperty(
+ Constants.ENGAGE_ADDRESSING_IN_MESSAGE, Boolean.TRUE);
+
+ }
+ //Now hadle the outbound message with addressing
+ if (smc.getProperty(
+ Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE) != null) {
+ messageContext.setProperty(
+ Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE,
+ Boolean.TRUE);
+
}
MessageContext outMsgContext = Axis2FlexibleMEPClient
@@ -65,19 +73,18 @@
// run all rules on response
- // todo: this logic need to be imporved with sendNow() and drop()
smc.setResponse(true);
- ///////////////////////////////////////////////////////////////////
- // special treat for Module Engagement
- ConfigurationContext configContext = (ConfigurationContext) smc
- .getProperty(
- Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT);
- if (configContext != null) {
- outMsgContext.setProperty(
- Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT,
- configContext);
- }
- //////////////////////////////////////////////////////////////////
+// ///////////////////////////////////////////////////////////////////
+// // special treat for Module Engagement
+// ConfigurationContext configContext = (ConfigurationContext) smc
+// .getProperty(
+// Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT);
+// if (configContext != null) {
+// outMsgContext.setProperty(
+// Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT,
+// configContext);
+// }
+// //////////////////////////////////////////////////////////////////
outMsgContext.setServerSide(true);
@@ -148,19 +155,18 @@
.getHeader());
}
-
+
messageContext
- .setProperty(Constants.ISRESPONSE_PROPERTY, new Boolean(
- true));
+ .setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.TRUE);
// check for addressing is alredy engaged for this message.
// if engage we should use the address enable Configuraion context.
- ConfigurationContext configContext = (ConfigurationContext) smc
- .getProperty(
- Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT);
- if (configContext != null) {
- messageContext.setConfigurationContext(configContext);
- }
+// ConfigurationContext configContext = (ConfigurationContext) smc
+// .getProperty(
+// Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT);
+// if (configContext != null) {
+// messageContext.setConfigurationContext(configContext);
+// }
ae.send(messageContext);
} catch (AxisFault e) {
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironment.java Sun Mar 26 03:03:22 2006
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.axis2.om.OMElement;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,6 +30,7 @@
import org.apache.synapse.resources.ResourceHelper;
import org.apache.synapse.xml.ProcessorConfiguratorFinder;
+import org.apache.axiom.om.OMElement;
/**
*
@@ -40,11 +40,11 @@
*
*/
public class Axis2SynapseEnvironment extends SynapseEnvironment {
- private Processor mainprocessor = null;
+ private Processor mainprocessor = null;
- private ClassLoader cl = null;
+ private ClassLoader cl = null;
- private Map processors = new HashMap();
+ private Map processors = new HashMap();
private Log log = LogFactory.getLog(getClass());
@@ -52,51 +52,51 @@
private HashMap resourceProcessors = new HashMap();
public Axis2SynapseEnvironment(OMElement synapseConfiguration,
- ClassLoader cl) {
- super(null);
- this.cl = cl;
- if (synapseConfiguration!=null)
- mainprocessor = ProcessorConfiguratorFinder.getProcessor(this, synapseConfiguration);
- }
-
- public void injectMessage(SynapseMessage smc) {
- mainprocessor.process(this, smc);
- }
-
- public ClassLoader getClassLoader() {
- return cl;
- }
-
- public void setClassLoader(ClassLoader cl) {
- this.cl = cl;
- }
-
- public void send(SynapseMessage sm, SynapseEnvironment se) {
- if (sm.isResponse())
- Axis2Sender.sendBack(sm);
- else
- Axis2Sender.sendOn(sm, se);
- }
-
-
- public Processor lookupProcessor(String name) {
- return (Processor) processors.get(name);
- }
-
- public void addProcessor(Processor p) {
- log.debug("adding processor with name " + p.getName());
- if (processors.containsKey(p.getName()))
- log.warn("name " + p.getName() + "already present");
- processors.put(p.getName(), p);
- }
-
- public Processor getMasterProcessor() {
- return mainprocessor;
- }
-
- public void setMasterProcessor(Processor p) {
- mainprocessor = p;
- }
+ ClassLoader cl) {
+ super(null);
+ this.cl = cl;
+ if (synapseConfiguration!=null)
+ mainprocessor = ProcessorConfiguratorFinder.getProcessor(this, synapseConfiguration);
+ }
+
+ public void injectMessage(SynapseMessage smc) {
+ mainprocessor.process(this, smc);
+ }
+
+ public ClassLoader getClassLoader() {
+ return cl;
+ }
+
+ public void setClassLoader(ClassLoader cl) {
+ this.cl = cl;
+ }
+
+ public void send(SynapseMessage sm, SynapseEnvironment se) {
+ if (sm.isResponse())
+ Axis2Sender.sendBack(sm);
+ else
+ Axis2Sender.sendOn(sm, se);
+ }
+
+
+ public Processor lookupProcessor(String name) {
+ return (Processor) processors.get(name);
+ }
+
+ public void addProcessor(Processor p) {
+ log.debug("adding processor with name " + p.getName());
+ if (processors.containsKey(p.getName()))
+ log.warn("name " + p.getName() + "already present");
+ processors.put(p.getName(), p);
+ }
+
+ public Processor getMasterProcessor() {
+ return mainprocessor;
+ }
+
+ public void setMasterProcessor(Processor p) {
+ mainprocessor = p;
+ }
// lookup methods for resources handling
public Processor lookupResourceProcessor(String uriRoot) {
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java Sun Mar 26 03:03:22 2006
@@ -23,14 +23,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterImpl;
import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
import org.apache.synapse.Constants;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMElement;
/**
* <p/>
@@ -69,7 +68,7 @@
Axis2SynapseEnvironment se = new Axis2SynapseEnvironment(config, mc
.getAxisService().getClassLoader());
- synapseEnvParam = new ParameterImpl(SYNAPSE_ENVIRONMENT, null);
+ synapseEnvParam = new Parameter(SYNAPSE_ENVIRONMENT, null);
synapseEnvParam.setValue(se);
try {
ac.addParameter(synapseEnvParam);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2SynapseMessage.java Sun Mar 26 03:03:22 2006
@@ -23,9 +23,9 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.addressing.RelatesTo;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.synapse.Constants;
import org.apache.synapse.SynapseMessage;
+import org.apache.axiom.soap.SOAPEnvelope;
/**
*
@@ -36,180 +36,180 @@
*/
public class Axis2SynapseMessage implements SynapseMessage {
- private MessageContext mc = null;
+ private MessageContext mc = null;
- private Map props = new HashMap();
+ private Map props = new HashMap();
- private boolean response = false;
+ private boolean response = false;
private boolean faultResponse = false;
public Axis2SynapseMessage(MessageContext mc) {
- setMessageContext(mc);
- }
+ setMessageContext(mc);
+ }
- public EndpointReference getFaultTo() {
- return mc.getFaultTo();
- }
+ public EndpointReference getFaultTo() {
+ return mc.getFaultTo();
+ }
- public void setFaultTo(EndpointReference reference) {
- mc.setFaultTo(reference);
- }
+ public void setFaultTo(EndpointReference reference) {
+ mc.setFaultTo(reference);
+ }
- public EndpointReference getFrom() {
- return mc.getFrom();
- }
+ public EndpointReference getFrom() {
+ return mc.getFrom();
+ }
- public void setFrom(EndpointReference reference) {
- mc.setFrom(reference);
+ public void setFrom(EndpointReference reference) {
+ mc.setFrom(reference);
- }
+ }
- public SOAPEnvelope getEnvelope() {
+ public SOAPEnvelope getEnvelope() {
- return mc.getEnvelope();
- }
+ return mc.getEnvelope();
+ }
- public void setEnvelope(SOAPEnvelope envelope) throws AxisFault {
- mc.setEnvelope(envelope);
+ public void setEnvelope(SOAPEnvelope envelope) throws AxisFault {
+ mc.setEnvelope(envelope);
- }
+ }
- public String getMessageID() {
- return mc.getMessageID();
- }
+ public String getMessageID() {
+ return mc.getMessageID();
+ }
- public void setMessageID(String string) {
- mc.setMessageID(string);
+ public void setMessageID(String string) {
+ mc.setMessageID(string);
- }
+ }
- public RelatesTo getRelatesTo() {
- return mc.getRelatesTo();
+ public RelatesTo getRelatesTo() {
+ return mc.getRelatesTo();
- }
+ }
- public void setRelatesTo(RelatesTo reference) {
- mc.setRelatesTo(reference);
+ public void setRelatesTo(RelatesTo reference) {
+ mc.setRelatesTo(reference);
- }
+ }
- public EndpointReference getReplyTo() {
- return mc.getReplyTo();
+ public EndpointReference getReplyTo() {
+ return mc.getReplyTo();
- }
+ }
- public void setReplyTo(EndpointReference reference) {
- mc.setReplyTo(reference);
+ public void setReplyTo(EndpointReference reference) {
+ mc.setReplyTo(reference);
- }
+ }
- public EndpointReference getTo() {
- return mc.getTo();
+ public EndpointReference getTo() {
+ return mc.getTo();
- }
+ }
- public void setTo(EndpointReference reference) {
- mc.setTo(reference);
+ public void setTo(EndpointReference reference) {
+ mc.setTo(reference);
- }
+ }
- public void setWSAAction(String actionURI) {
- mc.setWSAAction(actionURI);
+ public void setWSAAction(String actionURI) {
+ mc.setWSAAction(actionURI);
- }
+ }
- public String getWSAAction() {
+ public String getWSAAction() {
- return mc.getWSAAction();
- }
+ return mc.getWSAAction();
+ }
- public void setMessageId(String messageID) {
- mc.setWSAMessageId(messageID);
+ public void setMessageId(String messageID) {
+ mc.setWSAMessageId(messageID);
- }
+ }
- public String getMessageId() {
- return mc.getMessageID();
- }
+ public String getMessageId() {
+ return mc.getMessageID();
+ }
- public Object getProperty(String key) {
+ public Object getProperty(String key) {
Object obj = props.get(key);
if ( obj == null) {
obj = mc.getProperty(key);
- }
+ }
return obj;
- }
+ }
- public void setProperty(String key, Object value) {
- props.put(key, value);
- }
+ public void setProperty(String key, Object value) {
+ props.put(key, value);
+ }
- public Iterator getPropertyNames() {
- return props.keySet().iterator();
- }
+ public Iterator getPropertyNames() {
+ return props.keySet().iterator();
+ }
- public String getSoapAction() {
- return mc.getSoapAction();
- }
+ public String getSoapAction() {
+ return mc.getSoapAction();
+ }
- public void setSoapAction(String string) {
- mc.setSoapAction(string);
+ public void setSoapAction(String string) {
+ mc.setSoapAction(string);
- }
+ }
- public boolean isDoingMTOM() {
+ public boolean isDoingMTOM() {
- return mc.isDoingMTOM();
- }
+ return mc.isDoingMTOM();
+ }
- public void setDoingMTOM(boolean b) {
- mc.setDoingMTOM(b);
+ public void setDoingMTOM(boolean b) {
+ mc.setDoingMTOM(b);
- }
+ }
- public boolean isDoingREST() {
+ public boolean isDoingREST() {
- return mc.isDoingREST();
- }
+ return mc.isDoingREST();
+ }
- public void setDoingREST(boolean b) {
- mc.setDoingREST(b);
+ public void setDoingREST(boolean b) {
+ mc.setDoingREST(b);
- }
+ }
- public boolean isSOAP11() {
+ public boolean isSOAP11() {
- return mc.isSOAP11();
- }
+ return mc.isSOAP11();
+ }
- public MessageContext getMessageContext() {
- return mc;
- }
+ public MessageContext getMessageContext() {
+ return mc;
+ }
- public void setMessageContext(MessageContext mc) {
- this.mc = mc;
- Boolean resp = (Boolean) mc.getProperty(Constants.ISRESPONSE_PROPERTY);
- if (resp != null)
- response = resp.booleanValue();
- }
+ public void setMessageContext(MessageContext mc) {
+ this.mc = mc;
+ Boolean resp = (Boolean) mc.getProperty(Constants.ISRESPONSE_PROPERTY);
+ if (resp != null)
+ response = resp.booleanValue();
+ }
- public void setResponse(boolean b) {
- response = b;
- mc.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.valueOf(b));
- }
+ public void setResponse(boolean b) {
+ response = b;
+ mc.setProperty(Constants.ISRESPONSE_PROPERTY, Boolean.valueOf(b));
+ }
- public boolean isResponse() {
- return response;
- }
+ public boolean isResponse() {
+ return response;
+ }
public void setFaultResponse(boolean b) {
this.faultResponse = b;
}
public boolean isFaultResponse() {
- return this.faultResponse;
+ return this.faultResponse;
}
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/DynamicAxisOperation.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/DynamicAxisOperation.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/DynamicAxisOperation.java Sun Mar 26 03:03:22 2006
@@ -134,8 +134,7 @@
TransportInDescription transportIn = options.getTransportIn();
if (transportIn == null) {
mc.setTransportIn(ClientUtils.inferInTransport(cc
- .getAxisConfiguration(), options, mc
- .getServiceContext()));
+ .getAxisConfiguration(), options, mc));
} else {
mc.setTransportIn(transportIn);
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/SendNowProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/SendNowProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/SendNowProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/SendNowProcessor.java Sun Mar 26 03:03:22 2006
@@ -29,17 +29,18 @@
import org.apache.axis2.context.ServiceContext;
import org.apache.axis2.AxisFault;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.util.UUIDGenerator;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.AxisEngine;
import org.apache.wsdl.WSDLConstants;
+import org.apache.axiom.soap.SOAPEnvelope;
import javax.xml.namespace.QName;
@@ -85,7 +86,7 @@
phasesInfo.setOperationPhases(operation);
}
ServiceGroupContext sgc = new ServiceGroupContext(cc,
- ac.getService("__ANONYMOUS_SERVICE__").getParent());
+ (AxisServiceGroup)ac.getService("__ANONYMOUS_SERVICE__").getParent());
ServiceContext sc =
sgc.getServiceContext(new AxisService("__ANONYMOUS_SERVICE__"));
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java Sun Mar 26 03:03:22 2006
@@ -21,6 +21,7 @@
import org.apache.axis2.context.*;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisModule;
import org.apache.axis2.engine.AxisConfiguration;
@@ -40,6 +41,8 @@
import org.apache.synapse.processors.AbstractProcessor;
+import javax.xml.namespace.QName;
+
/**
* <p/>
@@ -54,7 +57,10 @@
log.debug("Processing __AddressingInHandler__");
try {
MessageContext mc = ((Axis2SynapseMessage)smc).getMessageContext();
- se.setProperty(Constants.ADDRESSING_PROCESSED,Boolean.TRUE);
+
+ // for this execution chain set Addressing as processed
+ smc.setProperty(Constants.ENGAGE_ADDRESSING_IN_MESSAGE,Boolean.TRUE);
+
// default configuration_contex and axis_configuration
ConfigurationContext cc = mc.getConfigurationContext();
AxisConfiguration ac = cc.getAxisConfiguration();
@@ -62,6 +68,18 @@
if (as == null)
throw new SynapseException("cannot locate service "
+ Constants.EMPTYMEDIATOR);
+ // Engagin addressing
+
+
+ AxisModule module = ac.getModule(new QName("addressing"));
+ if (module == null)
+ throw new SynapseException("cannot locate addressing module in the repository ");
+
+ if (!as.isEngaged(module.getName())) {
+ as.engageModule(module, ac);
+ }
+
+// ac.engageModule(new QName("addressing"));
AxisEngine ae = new AxisEngine(cc);
AxisOperation ao = as
@@ -69,11 +87,17 @@
OperationContext oc = OperationContextFactory
.createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
ao.registerOperationContext(mc,oc);
- ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
+ ServiceContext sc = Utils.fillContextInformation(as, cc);
oc.setParent(sc);
mc.setAxisOperation(ao);
mc.setAxisService(as);
ae.receive(mc);
+ // purpose of addressing is over now disengage addressing
+// ac.disEngageModule(addressingModule);
+ if (as.isEngaged(module.getName())) {
+ ac.disEngageModule(ac.getModule(module.getName()));
+ }
+
} catch (AxisFault axisFault) {
throw new SynapseException(
Added: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingOutMediator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingOutMediator.java?rev=388894&view=auto
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingOutMediator.java (added)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/AddressingOutMediator.java Sun Mar 26 03:03:22 2006
@@ -0,0 +1,29 @@
+package org.apache.synapse.processors.builtin.axis2;
+
+import org.apache.synapse.processors.AbstractProcessor;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.Constants;
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class AddressingOutMediator extends AbstractProcessor {
+ public boolean process(SynapseEnvironment se, SynapseMessage sm) {
+ // engage addressing outhandler in the out bound message.
+ sm.setProperty(Constants.ENGAGE_ADDRESSING_OUT_BOUND_MESSAGE, Boolean.TRUE);
+ return true;
+ }
+}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java Sun Mar 26 03:03:22 2006
@@ -17,11 +17,6 @@
package org.apache.synapse.processors.builtin.axis2;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMDocument;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,6 +25,11 @@
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.processors.AbstractProcessor;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMDocument;
/**
@@ -70,7 +70,7 @@
EndpointReference tempEPR = smc.getTo();
smc.setTo(smc.getReplyTo());
smc.setReplyTo(tempEPR);
-
+
se.injectMessage(smc);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/SecurityProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/SecurityProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/SecurityProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/axis2/SecurityProcessor.java Sun Mar 26 03:03:22 2006
@@ -56,7 +56,7 @@
.createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
ao.registerOperationContext(mc, oc);
- ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
+ ServiceContext sc = Utils.fillContextInformation(as, cc);
oc.setParent(sc);
mc.setOperationContext(oc);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessor.java Sun Mar 26 03:03:22 2006
@@ -15,14 +15,14 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.processors.AbstractProcessor;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAbstractFactory;
/**
*
@@ -34,58 +34,58 @@
*/
public class XSLTProcessor extends AbstractProcessor {
- private Transformer tran = null;
+ private Transformer tran = null;
- private boolean isBody = false;
+ private boolean isBody = false;
- public boolean process(SynapseEnvironment se, SynapseMessage smc) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- XMLStreamWriter xsw;
- try {
- xsw = XMLOutputFactory.newInstance().createXMLStreamWriter(baos);
-
- if (isBody) smc.getEnvelope().getBody().serialize(xsw);
- else smc.getEnvelope().serialize(xsw);
-
- Source src = new StreamSource(new ByteArrayInputStream(baos.toByteArray()));
- ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
- StreamResult result = new StreamResult(baos2);
- tran.transform(src, result);
- StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(baos2.toByteArray()));
- OMElement nw = builder.getDocumentElement();
- if (isBody) smc.getEnvelope().setFirstChild(nw);
- //TODO don't assume SOAP 1.1
- else smc.setEnvelope(OMAbstractFactory.getSOAP11Factory().createSOAPEnvelope(builder));
-
- } catch (Exception e) {
- throw new SynapseException(e);
- }
- return true;
- }
-
- /**
- * @param b
- * <p> If isBody is true then the XSLT is applied to the Body of the SOAP message, otherwise to the whole env
- */
- public void setIsBody(boolean b) {
- isBody = b;
- }
-
-
- /**
- * @param is
- * <p>
- * This sets the correct XSL transform
- */
- public void setXSLInputStream(InputStream is) {
- try {
- Source src = new StreamSource(is);
- tran = TransformerFactory.newInstance().newTransformer(src);
- } catch (Exception e) {
- throw new SynapseException(e);
-
- }
- }
+ public boolean process(SynapseEnvironment se, SynapseMessage smc) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ XMLStreamWriter xsw;
+ try {
+ xsw = XMLOutputFactory.newInstance().createXMLStreamWriter(baos);
+
+ if (isBody) smc.getEnvelope().getBody().serialize(xsw);
+ else smc.getEnvelope().serialize(xsw);
+
+ Source src = new StreamSource(new ByteArrayInputStream(baos.toByteArray()));
+ ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
+ StreamResult result = new StreamResult(baos2);
+ tran.transform(src, result);
+ StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(baos2.toByteArray()));
+ OMElement nw = builder.getDocumentElement();
+ if (isBody) smc.getEnvelope().setFirstChild(nw);
+ //TODO don't assume SOAP 1.1
+ else smc.setEnvelope(OMAbstractFactory.getSOAP11Factory().createSOAPEnvelope(builder));
+
+ } catch (Exception e) {
+ throw new SynapseException(e);
+ }
+ return true;
+ }
+
+ /**
+ * @param b
+ * <p> If isBody is true then the XSLT is applied to the Body of the SOAP message, otherwise to the whole env
+ */
+ public void setIsBody(boolean b) {
+ isBody = b;
+ }
+
+
+ /**
+ * @param is
+ * <p>
+ * This sets the correct XSL transform
+ */
+ public void setXSLInputStream(InputStream is) {
+ try {
+ Source src = new StreamSource(is);
+ tran = TransformerFactory.newInstance().newTransformer(src);
+ } catch (Exception e) {
+ throw new SynapseException(e);
+
+ }
+ }
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/builtin/xslt/XSLTProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -4,8 +4,6 @@
import javax.xml.namespace.QName;
-import org.apache.axis2.om.OMAttribute;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.xml.Constants;
import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
@@ -14,7 +12,8 @@
import org.apache.synapse.xml.AbstractProcessorConfigurator;
-
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
/**
@@ -27,31 +26,31 @@
* <p>If type is not present, assumed to be body
*/
public class XSLTProcessorConfigurator extends AbstractProcessorConfigurator {
- private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE, "xslt");
-
- public Processor createProcessor(SynapseEnvironment se, OMElement el) {
- XSLTProcessor xp = new XSLTProcessor();
- super.setNameOnProcessor(se,el,xp);
-
- OMAttribute type = el.getAttribute(new QName("type"));
- if (type != null && type.getAttributeValue().trim().toLowerCase().equals("envelope")) xp.setIsBody(false);
- else xp.setIsBody(true);
-
- OMAttribute xsl = el.getAttribute(new QName("xsl"));
- if (xsl == null) throw new SynapseException("no xsl attribute on: "+el.toString());
-
- InputStream xslStream = se.getClassLoader().getResourceAsStream(xsl.getAttributeValue());
- xp.setXSLInputStream(xslStream);
-
- return xp;
-
-
-
- }
-
- public QName getTagQName() {
-
- return tagName;
- }
+ private static final QName tagName = new QName(Constants.SYNAPSE_NAMESPACE, "xslt");
+
+ public Processor createProcessor(SynapseEnvironment se, OMElement el) {
+ XSLTProcessor xp = new XSLTProcessor();
+ super.setNameOnProcessor(se,el,xp);
+
+ OMAttribute type = el.getAttribute(new QName("type"));
+ if (type != null && type.getAttributeValue().trim().toLowerCase().equals("envelope")) xp.setIsBody(false);
+ else xp.setIsBody(true);
+
+ OMAttribute xsl = el.getAttribute(new QName("xsl"));
+ if (xsl == null) throw new SynapseException("no xsl attribute on: "+el.toString());
+
+ InputStream xslStream = se.getClassLoader().getResourceAsStream(xsl.getAttributeValue());
+ xp.setXSLInputStream(xslStream);
+
+ return xp;
+
+
+
+ }
+
+ public QName getTagQName() {
+
+ return tagName;
+ }
}
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/DefaultProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/DefaultProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/DefaultProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/DefaultProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -4,7 +4,7 @@
import org.apache.synapse.xml.Constants;
import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
import javax.xml.namespace.QName;
/*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/ExactlyOneProcessorConfigurator.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/ExactlyOneProcessorConfigurator.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/ExactlyOneProcessorConfigurator.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/conditions/ExactlyOneProcessorConfigurator.java Sun Mar 26 03:03:22 2006
@@ -4,7 +4,7 @@
import org.apache.synapse.xml.Constants;
import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
import javax.xml.namespace.QName;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java Sun Mar 26 03:03:22 2006
@@ -81,7 +81,7 @@
.createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
ao.registerOperationContext(messageContext, oc);
- ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
+ ServiceContext sc = Utils.fillContextInformation(as, cc);
oc.setParent(sc);
messageContext.setOperationContext(oc);
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/rules/XPathProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/rules/XPathProcessor.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/rules/XPathProcessor.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/processors/rules/XPathProcessor.java Sun Mar 26 03:03:22 2006
@@ -16,7 +16,6 @@
package org.apache.synapse.processors.rules;
-import org.apache.axis2.om.xpath.AXIOMXPath;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseEnvironment;
@@ -24,6 +23,7 @@
import org.apache.synapse.SynapseMessage;
import org.apache.synapse.SynapseMessageConstants;
import org.apache.synapse.processors.ListProcessor;
+import org.apache.axiom.om.xpath.AXIOMXPath;
import org.jaxen.JaxenException;
/**
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHandler.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHandler.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHandler.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHandler.java Sun Mar 26 03:03:22 2006
@@ -1,6 +1,7 @@
package org.apache.synapse.resources;
-import org.apache.axis2.om.OMElement;
+import org.apache.axiom.om.OMElement;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelper.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelper.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelper.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelper.java Sun Mar 26 03:03:22 2006
@@ -16,8 +16,8 @@
package org.apache.synapse.resources;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.api.ResourceUpdateAware;
+import org.apache.axiom.om.OMElement;
/**
*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelperImpl.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelperImpl.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelperImpl.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/ResourceHelperImpl.java Sun Mar 26 03:03:22 2006
@@ -1,8 +1,8 @@
package org.apache.synapse.resources;
-import org.apache.axis2.om.OMElement;
import org.apache.synapse.api.ResourceUpdateAware;
import org.apache.synapse.SynapseException;
+import org.apache.axiom.om.OMElement;
import java.util.HashMap;
import java.util.Map;
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/http/SimpleGETResourceHandler.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/http/SimpleGETResourceHandler.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/http/SimpleGETResourceHandler.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/http/SimpleGETResourceHandler.java Sun Mar 26 03:03:22 2006
@@ -2,18 +2,17 @@
import org.apache.synapse.resources.ResourceHandler;
import org.apache.synapse.SynapseException;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import java.util.HashMap;
-import java.util.Set;
import java.io.IOException;
import java.io.InputStream;
/*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/PropertyMediatorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/PropertyMediatorFactory.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/PropertyMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/PropertyMediatorFactory.java Sun Mar 26 03:03:22 2006
@@ -5,8 +5,8 @@
import org.apache.synapse.Processor;
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAttribute;
import javax.xml.namespace.QName;
/*
Modified: incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/ResourceMediatorFactory.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/ResourceMediatorFactory.java?rev=388894&r1=388893&r2=388894&view=diff
==============================================================================
--- incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/ResourceMediatorFactory.java (original)
+++ incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/resources/xml/ResourceMediatorFactory.java Sun Mar 26 03:03:22 2006
@@ -7,10 +7,10 @@
import org.apache.synapse.SynapseEnvironment;
import org.apache.synapse.SynapseException;
import org.apache.synapse.processors.ListProcessor;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMAttribute;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
import javax.xml.namespace.QName;
import java.util.Iterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org