You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/05/09 08:19:51 UTC
svn commit: r536435 - in /webservices/synapse/trunk/java:
modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
repository/conf/axis2.xml
Author: asankha
Date: Tue May 8 23:19:51 2007
New Revision: 536435
URL: http://svn.apache.org/viewvc?view=rev&rev=536435
Log:
Fix WS-RM engagement on proxy services
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
webservices/synapse/trunk/java/repository/conf/axis2.xml
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java?view=diff&rev=536435&r1=536434&r2=536435
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java Tue May 8 23:19:51 2007
@@ -26,6 +26,8 @@
import org.apache.axis2.util.Utils;
import org.apache.axis2.transport.nhttp.NhttpConstants;
import org.apache.axis2.addressing.RelatesTo;
+import org.apache.axis2.addressing.AddressingConstants;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Constants;
@@ -199,7 +201,8 @@
synapseOutMsgCtx.getEnvironment());
synapseInMessageContext.setResponse(true);
- synapseInMessageContext.setTo(null);
+ synapseInMessageContext.setTo(
+ new EndpointReference(AddressingConstants.Final.WSA_ANONYMOUS_URL));
// set the properties of the original MC to the new MC
Iterator iter = synapseOutMsgCtx.getPropertyKeySet().iterator();
Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java?view=diff&rev=536435&r1=536434&r2=536435
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseModule.java Tue May 8 23:19:51 2007
@@ -94,6 +94,12 @@
synapseService.setExposedTransports(transports);
axisCfg.addService(synapseService);
+ log.info("Initializing Sandesha 2...");
+ AxisModule sandeshaAxisModule = configurationContext.getAxisConfiguration().
+ getModule(Constants.SANDESHA2_MODULE_NAME);
+ Module sandesha2 = sandeshaAxisModule.getModule();
+ sandesha2.init(configurationContext, sandeshaAxisModule);
+
log.info("Deploying Proxy services...");
Iterator iter = synCfg.getProxyServices().iterator();
while (iter.hasNext()) {
Modified: webservices/synapse/trunk/java/repository/conf/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/axis2.xml?view=diff&rev=536435&r1=536434&r2=536435
==============================================================================
--- webservices/synapse/trunk/java/repository/conf/axis2.xml (original)
+++ webservices/synapse/trunk/java/repository/conf/axis2.xml Tue May 8 23:19:51 2007
@@ -158,21 +158,21 @@
<!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ)
<transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
- <parameter name="myTopicConnectionFactory" locked="false">
+ <parameter name="myTopicConnectionFactory" locked="false">
<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">TopicConnectionFactory</parameter>
</parameter>
- <parameter name="myQueueConnectionFactory" locked="false">
+ <parameter name="myQueueConnectionFactory" locked="false">
<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
</parameter>
- <parameter name="default" locked="false">
+ <parameter name="default" locked="false">
<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
+ <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
</parameter>
</transportReceiver>-->
@@ -223,12 +223,12 @@
<!-- Clustering -->
<!-- ================================================= -->
<!-- Configure and uncomment following for preparing Axis2 to a clustered environment -->
- <!--
+ <!--
<cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
<parameter name="param1" locked="false">value1</parameter>
</cluster>
-->
-
+
<!-- ================================================= -->
<!-- Phases -->
<!-- ================================================= -->
@@ -265,23 +265,18 @@
class="org.apache.axis2.engine.HTTPLocationBasedDispatcher">
<order phase="Dispatch"/>
</handler>
-
+
<handler name="InstanceDispatcher"
class="org.apache.axis2.engine.InstanceDispatcher">
<order phase="Dispatch"/>
</handler>
</phase>
- <!-- System pre defined phases -->
- <phase name="RMPhase"/>
- <!-- After Postdispatch phase module author or or service author can add any phase he want -->
<phase name="OperationInPhase"/>
+ <phase name="RMPhase"/>
</phaseOrder>
<phaseOrder type="OutFlow">
- <!-- user can add his own phases to this area -->
<phase name="RMPhase"/>
<phase name="OperationOutPhase"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
<phase name="Security"/>
@@ -323,12 +318,10 @@
<order phase="PostDispatch"/>
</handler>
</phase>
- <!-- user can add his own phases to this area -->
- <phase name="RMPhase"/>
<phase name="OperationInFaultPhase"/>
+ <phase name="RMPhase"/>
</phaseOrder>
<phaseOrder type="OutFaultFlow">
- <!-- user can add his own phases to this area -->
<phase name="RMPhase"/>
<phase name="OperationOutFaultPhase"/>
<phase name="PolicyDetermination"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org