svn commit: r390413 - in /incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2: Axis2Sender.java Axis2SynapseEnvironmentFinder.java Axis2SynapseMessage.java

[pzf]

Author: pzf
Date: Fri Mar 31 05:10:01 2006
New Revision: 390413

URL: http://svn.apache.org/viewcvs?rev=390413&view=rev
Log: (empty)

Modified:
    
incubator/synapse/trunk/java/modules/core/src/org/apache/synapse/axis2/Axis2Sender.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

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=390413&r1=390412&r2=390413&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
 Fri Mar 31 05:10:01 2006
@@ -134,9 +134,13 @@
             TransportInDescription ti = messageContext.getTransportIn();
 
             outMsgContext.setTransportIn(ti);
+            
+            if (smc.getSynapseEnvironment()==null) {
+               throw new SynapseException("no Synapse Env set on message");
+            }
             smc.getSynapseEnvironment().injectMessage(new 
Axis2SynapseMessage(outMsgContext));
-
         } catch (Exception e) {
+               e.printStackTrace();
             throw new SynapseException(e);
         }
     }

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=390413&r1=390412&r2=390413&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
 Fri Mar 31 05:10:01 2006
@@ -30,6 +30,8 @@
 import org.apache.synapse.Constants;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * <p/>
@@ -37,14 +39,14 @@
  * This class is used by the SynapseMessageReceiver to find the environment. 
The env is stored in a Parameter to the Axis2 config
  */
 public class Axis2SynapseEnvironmentFinder implements Constants {
-
+       private static Log log = 
LogFactory.getLog(Axis2SynapseEnvironmentFinder.class);
     public static synchronized SynapseEnvironment getSynapseEnvironment(
             MessageContext mc) {
         AxisConfiguration ac =
                 mc.getConfigurationContext().getAxisConfiguration();
         Parameter synapseEnvParam = ac.getParameter(SYNAPSE_ENVIRONMENT);
         if (synapseEnvParam == null) {
-
+               log.debug("synapse env not available - creating");
             Parameter param = ac.getParameter(SYNAPSECONFIGURATION);
             if (param == null) {
                 throw new SynapseException("no parameter '"
@@ -78,6 +80,18 @@
         }
         return (SynapseEnvironment) synapseEnvParam.getValue();
 
+    }
+    public static synchronized void setSynapseEnvironment(MessageContext mc, 
SynapseEnvironment se) {
+         AxisConfiguration ac =
+              mc.getConfigurationContext().getAxisConfiguration();
+         Parameter synapseEnvParam = new Parameter(SYNAPSE_ENVIRONMENT, null);
+          synapseEnvParam.setValue(se);
+         try {
+                       ac.addParameter(synapseEnvParam);
+               } catch (AxisFault e) {
+                       throw new SynapseException(e);
+               }
+       
     }
 
 }

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=390413&r1=390412&r2=390413&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
 Fri Mar 31 05:10:01 2006
@@ -47,6 +47,7 @@
 
     public Axis2SynapseMessage(MessageContext mc) {
         setMessageContext(mc);
+        
setSynapseEnvironment(Axis2SynapseEnvironmentFinder.getSynapseEnvironment(mc));
     }
 
     public EndpointReference getFaultTo() {
@@ -218,10 +219,8 @@
        }
 
        public void setSynapseEnvironment(SynapseEnvironment env) {
-               mc.setProperty(
-                org.apache.synapse.Constants.MEDIATOR_SYNAPSE_ENV_PROPERTY,env
-                );
-               
+               Axis2SynapseEnvironmentFinder.setSynapseEnvironment(mc, env);
+               return;
        }
        
        



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]