svn commit: r1296151 - in /axis/axis2/java/core/branches/1_6/modules: integration/test/org/apache/axis2/engine/ kernel/src/org/apache/axis2/context/ kernel/src/org/apache/axis2/util/

[azeez]

Author: azeez
Date: Fri Mar  2 11:33:16 2012
New Revision: 1296151

URL: http://svn.apache.org/viewvc?rev=1296151&view=rev
Log:
Merging IN_MESSAGE_CONTEXT to MessageContext change from trunk to 1_6 branch


Modified:
    
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
    
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java

Modified: 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java?rev=1296151&r1=1296150&r2=1296151&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/engine/MessageContextChangeTest.java
 Fri Mar  2 11:33:16 2012
@@ -47,6 +47,7 @@ public class MessageContextChangeTest ex
             new FieldDescription("java.lang.String", "REMOTE_ADDR"),
             new FieldDescription("java.lang.String", "TRANSPORT_ADDR"),
             new FieldDescription("java.lang.String", "TRANSPORT_HEADERS"),
+            new FieldDescription("java.lang.String", "IN_MESSAGE_CONTEXT"),
             new FieldDescription("org.apache.axiom.attachments.Attachments", 
"attachments"),
             new FieldDescription("java.lang.String", "TRANSPORT_OUT"),
             new FieldDescription("java.lang.String", "TRANSPORT_IN"),

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java?rev=1296151&r1=1296150&r2=1296151&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/context/MessageContext.java
 Fri Mar  2 11:33:16 2012
@@ -180,6 +180,14 @@ public class MessageContext extends Abst
     public static final String TRANSPORT_ADDR = "TRANSPORT_ADDR";
     public static final String TRANSPORT_HEADERS = "TRANSPORT_HEADERS";
 
+    /**
+     * Constant used as the key for the property which stores the In 
MessageContext in the
+     * Out MessageContext/FaultMessageContext. This is needed in cases where 
an OperationContext
+     * is not created, for example, since the request never gets dispatched to 
the service
+     * operation, either due to a security failure or a request coming in for 
a non-existing
+     * endpoint
+     */
+    public static final String IN_MESSAGE_CONTEXT = "axis2.inMsgContext";
 
     /**
      * message attachments

Modified: 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java?rev=1296151&r1=1296150&r2=1296151&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
 Fri Mar  2 11:33:16 2012
@@ -81,6 +81,7 @@ public class MessageContextBuilder {
         newmsgCtx.setTransportIn(inMessageContext.getTransportIn());
         newmsgCtx.setTransportOut(inMessageContext.getTransportOut());
         newmsgCtx.setServerSide(inMessageContext.isServerSide());
+        newmsgCtx.setProperty(MessageContext.IN_MESSAGE_CONTEXT, 
inMessageContext);
 
         // TODO: Should this be specifying (or defaulting to) the "response" 
relationshipType??
         newmsgCtx.addRelatesTo(new 
RelatesTo(inMessageContext.getOptions().getMessageId()));
@@ -264,6 +265,7 @@ public class MessageContextBuilder {
                                                 processingContext.getProperty(
                                                         
Constants.OUT_TRANSPORT_INFO));
                 faultMessageContext.setProcessingFault(true);
+                
faultMessageContext.setProperty(MessageContext.IN_MESSAGE_CONTEXT, 
processingContext);
                 return faultMessageContext;
             }
         }