axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r560397 [3/5] - in /webservices/axis2/branches/java/jaxws21: ./ etc/ legal/ modules/adb-codegen/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb-codegen/src/org/apache/axis2/schema/typemap/ modules/adb-codegen/test-res...
Date Fri, 27 Jul 2007 21:59:00 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml Fri Jul 27 14:58:51 2007
@@ -152,22 +152,26 @@
                 <order phase="Dispatch"/>
             </handler>
         </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+         <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Addressing"/>
             </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
@@ -183,31 +187,26 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
+         <phase name="Addressing">
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--      user can add his own phases to this area  -->
         <phase name="OperationInFaultPhase"/>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml Fri Jul 27 14:58:51 2007
@@ -148,22 +148,26 @@
                 <order phase="Transport"/>
             </handler>
         </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+        <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Addressing"/>
             </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
@@ -179,31 +183,26 @@
         <phase name="Security"/>
     </phaseOrder>
     <phaseOrder type="InFaultFlow">
+         <phase name="Addressing">
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
-            <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--      user can add his own phases to this area  -->
         <phase name="OperationInFaultPhase"/>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml Fri Jul 27 14:58:51 2007
@@ -82,31 +82,26 @@
     <phaseOrder type="InFlow">
         <!--  System pre defined phases       -->
         <phase name="TransportIn"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+         <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-            <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Addressing"/>
             </handler>
-
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml Fri Jul 27 14:58:51 2007
@@ -130,22 +130,26 @@
                 <order phase="Dispatch"/>
             </handler>
         </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+         <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Addressing"/>
             </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml Fri Jul 27 14:58:51 2007
@@ -130,22 +130,26 @@
                 <order phase="Dispatch"/>
             </handler>
         </phase>
-        <phase name="Security"/>
-        <phase name="PreDispatch"/>
-        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+         <phase name="Addressing">
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
-                <order phase="Dispatch"/>
+                <order phase="Addressing"/>
             </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
-
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
-                <order phase="Dispatch"/>
-            </handler>
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesComplexDataTypesSOAP11Test.java Fri Jul 27 14:58:51 2007
@@ -207,8 +207,9 @@
         // now create the Article element with the above namespace
         OMElement articleElement = factory.createOMElement("Article", ns);
 
-        input.setAnyType(new OMElement[]{articleElement});
-        assertNotNull(stub.retArrayAnyType1D(input));
+       // comment out test case since now adb uses an object to represent an any type
+       // input.setAnyType(new OMElement[]{articleElement});
+       // assertNotNull(stub.retArrayAnyType1D(input));
     }
 
     /**
@@ -474,9 +475,10 @@
         // now create the Article element with the above namespace
         OMElement articleElement = factory.createOMElement("Article", ns);
 
-        OMElement ret = stub.retObject(articleElement);
-        assertNotNull(ret);
-        assertEquals(ret.toString(), articleElement.toString());
+        // comment out this test case since adb now uses an object to represents the any type
+        // OMElement ret = stub.retObject(articleElement);
+        // assertNotNull(ret);
+        // assertEquals(ret.toString(), articleElement.toString());
     }
 
     /**

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/rpc/complex/ComplexDataTypesDocLitBareTest.java Fri Jul 27 14:58:51 2007
@@ -209,9 +209,11 @@
         // now create the Article element with the above namespace
         OMElement articleElement = factory.createOMElement("Article", ns);
 
-        input.setAnyType(new OMElement[]{articleElement});
-        req.setInArrayAnyType1D(input);
-        assertNotNull(stub.retArrayAnyType1D(req));
+        // comment out this test case since now adb uses Object to represent any type
+        
+        // input.setAnyType(new OMElement[]{articleElement});
+        // req.setInArrayAnyType1D(input);
+        // assertNotNull(stub.retArrayAnyType1D(req));
         //TODOD : Need to fix this , seems like we are not getting the corrcet response
     }
 
@@ -490,11 +492,14 @@
         // now create the Article element with the above namespace
         OMElement articleElement = factory.createOMElement("Article", ns);
 
-        ComplexDataTypesDocLitBareStub.InObject req = new ComplexDataTypesDocLitBareStub.InObject();
-        req.setInObject(articleElement);
-        OMElement ret = stub.retObject(req).getRetObjectResult();
-        assertNotNull(ret);
-        assertEquals(ret.toString(), articleElement.toString());
+        // representing the any type with a OMElement is wrong. it should be an Object
+        // adb has fixed this now comment this test to fix this for java2wsdl as well
+
+        // ComplexDataTypesDocLitBareStub.InObject req = new ComplexDataTypesDocLitBareStub.InObject();
+        // req.setInObject(articleElement);
+        // OMElement ret = stub.retObject(req).getRetObjectResult();
+        // assertNotNull(ret);
+        // assertEquals(ret.toString(), articleElement.toString());
     }
 
     /**

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/pom.xml?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/pom.xml Fri Jul 27 14:58:51 2007
@@ -465,6 +465,17 @@
 										<include name="org/apache/axis2/jaxws/server/**"/>
 									</fileset>
 								</copy>
+                                <copy toDir="target/test-classes/services/SoapMessageMUProviderService/">
+                                    <fileset dir="target/test-classes">
+                                        <include name="org/apache/axis2/jaxws/provider/soapmsgmu/**"/>
+                                    </fileset>
+                                    <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgmu">
+                                        <include name="META-INF/**"/>
+                                    </fileset>
+                                    <fileset dir="target/classes">
+                                        <include name="org/apache/axis2/jaxws/server/**"/>
+                                    </fileset>
+                                </copy>
 								<copy toDir="target/test-classes/services/JAXBProviderService/">
 									<fileset dir="target/test-classes">
 										<include name="org/apache/axis2/jaxws/provider/jaxb/**"/>
@@ -806,6 +817,7 @@
 								<copy toDir="target/test-classes/">
 									<fileset dir="test-resources/">
 										<include name="**/*.properties"/>
+										<include name="**/axis2.xml"/>
 									</fileset>
 								</copy>
 							</tasks>
@@ -866,6 +878,11 @@
 						<property>
 							<name>javax.xml.soap.MetaFactory</name>
 							<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
+						</property>
+                        <!-- Need this for the client side to pickup an axis2.xml to configure SoapMessageMUProviderChecker -->
+						<property>
+						    <name>org.apache.axis2.jaxws.config.path</name>
+						    <value>./target/test-classes/axis2.xml</value>
 						</property>
 					</systemProperties>
 				</configuration>

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingImpl.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/binding/BindingImpl.java Fri Jul 27 14:58:51 2007
@@ -62,9 +62,10 @@
         this.endpointDesc = endpointDesc;
         // client
         this.bindingId = endpointDesc.getClientBindingID();
-        if (this.bindingId == null)
+        if (this.bindingId == null) {
             // server
             this.bindingId = endpointDesc.getBindingType();
+	}
         
         framework = new ClientFramework();
         framework.addConfigurator(RespectBindingFeature.ID, RESPECT_BINDING_CONFIGURATOR);
@@ -72,22 +73,21 @@
 
     public List<Handler> getHandlerChain() {
         if (handlers == null) {
+            // non-null so client apps can manipulate
             handlers =
                     new HandlerResolverImpl(endpointDesc.getServiceDescription()).getHandlerChain(endpointDesc.getPortInfo());
-            if (handlers == null)
-            handlers = new ArrayList<Handler>(); // non-null so client
-                                                 // apps can manipulate
         }
         return handlers;
     }
 
     public void setHandlerChain(List<Handler> list) {
         // handlers cannot be null so a client app can request and manipulate it
-        if (list == null)
+        if (list == null) {
             handlers = new ArrayList<Handler>(); // non-null, but rather
                                                     // empty
-        else
+        } else {
             this.handlers = list;
+        }
     }
 
     /**

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/ClientUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/ClientUtils.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/ClientUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/ClientUtils.java Fri Jul 27 14:58:51 2007
@@ -37,12 +37,12 @@
     public static String findSOAPAction(MessageContext ctx) {
         OperationDescription op = ctx.getOperationDescription();
         Boolean useSoapAction =
-                (Boolean)ctx.getProperties().get(BindingProvider.SOAPACTION_USE_PROPERTY);
+                (Boolean)ctx.getProperty(BindingProvider.SOAPACTION_USE_PROPERTY);
         if (useSoapAction != null && useSoapAction.booleanValue()) {
             // If SOAPAction use hasn't been disabled by the client, then first
             // look in the context properties.
             String action =
-                    (String)ctx.getProperties().get(BindingProvider.SOAPACTION_URI_PROPERTY);
+                    (String)ctx.getProperty(BindingProvider.SOAPACTION_URI_PROPERTY);
             if (action != null) {
                 if (log.isDebugEnabled()) {
                     log.debug("Setting soap action from JAX-WS request context.  Action [" +

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/PropertyMigrator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/PropertyMigrator.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/PropertyMigrator.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/PropertyMigrator.java Fri Jul 27 14:58:51 2007
@@ -19,8 +19,8 @@
 package org.apache.axis2.jaxws.client;
 
 import org.apache.axis2.Constants;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.spi.migrator.ApplicationContextMigrator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/AsyncResponse.java Fri Jul 27 14:58:51 2007
@@ -25,6 +25,7 @@
 import org.apache.axis2.jaxws.handler.HandlerChainProcessor;
 import org.apache.axis2.jaxws.handler.HandlerInvokerUtils;
 import org.apache.axis2.jaxws.handler.TransportHeadersAdapter;
+import org.apache.axis2.jaxws.message.attachments.AttachmentUtils;
 import org.apache.axis2.jaxws.spi.Constants;
 import org.apache.axis2.jaxws.spi.migrator.ApplicationContextMigratorUtil;
 import org.apache.commons.logging.Log;
@@ -101,6 +102,12 @@
 
         response = mc;
         response.setEndpointDescription(endpointDescription);
+        
+        // Check for cached attachment file(s) if attachments exist. 
+        if(response.getAxisMessageContext().getAttachmentMap() != null){
+        	AttachmentUtils.findCachedAttachment(response.getAxisMessageContext().getAttachmentMap());
+        }
+        
         latch.countDown();
 
         if (log.isDebugEnabled()) {

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/factory/MessageContextFactory.java Fri Jul 27 14:58:51 2007
@@ -20,8 +20,8 @@
 
 import org.apache.axis2.jaxws.context.WebServiceContextImpl;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.handler.LogicalMessageContext;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.handler.SoapMessageContext;
 
 import javax.xml.ws.WebServiceContext;

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java Fri Jul 27 14:58:51 2007
@@ -53,14 +53,10 @@
      */
     public static void addProperties(SOAPMessageContext soapMessageContext,
                                      MessageContext jaxwsMessageContext) {
-        org.apache.axis2.context.MessageContext axisMsgContext =
-                jaxwsMessageContext.getAxisMessageContext();
 
-        // Copy Axis2 MessageContext options.  It's possible that some set of Axis2 handlers
-        // have run and placed some properties in the context that need to be visible.  
-        // We don't, however, want to expose the Axis2 Operation/ServiceContext properties.
-        Map props = axisMsgContext.getOptions().getProperties();
-        soapMessageContext.putAll(props);
+        // Copy Axis2 MessageContext properties.  It's possible that some set of Axis2 handlers
+        // have run and placed some properties in the context that need to be visible.
+        soapMessageContext.putAll(jaxwsMessageContext.getProperties());
 
         EndpointDescription description = jaxwsMessageContext.getEndpointDescription();
         if (description !=null) {
@@ -98,18 +94,19 @@
         // If we are running within a servlet container, then JAX-WS requires that the
         // servlet related properties be set on the MessageContext
         soapMessageContext.put(javax.xml.ws.handler.MessageContext.SERVLET_CONTEXT,
-                               axisMsgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT));
+                               jaxwsMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT));
         soapMessageContext
                 .setScope(javax.xml.ws.handler.MessageContext.SERVLET_CONTEXT, Scope.APPLICATION);
+
         if (log.isDebugEnabled()) {
-            if (axisMsgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT) != null) {
+            if (jaxwsMessageContext.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT) != null) {
                 log.debug("Servlet Context Set");
             } else {
                 log.debug("Servlet Context not found");
             }
         }
 
-        HttpServletRequest req = (HttpServletRequest)axisMsgContext
+        HttpServletRequest req = (HttpServletRequest)jaxwsMessageContext
                 .getProperty(HTTPConstants.MC_HTTP_SERVLETREQUEST);
         if (req == null) {
             if (log.isDebugEnabled()) {
@@ -159,7 +156,7 @@
             }
 
         }
-        HttpServletResponse res = (HttpServletResponse)axisMsgContext
+        HttpServletResponse res = (HttpServletResponse)jaxwsMessageContext
                 .getProperty(HTTPConstants.MC_HTTP_SERVLETRESPONSE);
         if (res == null) {
             if (log.isDebugEnabled()) {

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java Fri Jul 27 14:58:51 2007
@@ -22,6 +22,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.jaxws.description.EndpointDescription;
 import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.util.MessageUtils;
 
@@ -60,8 +61,8 @@
     private boolean isOutbound;  // Outbound or inbound message context
     
     // TODO:  flag to set whether we delegate property setting up to the
-    // axis2 options objecct or keep it local
-    private boolean DELEGATE_TO_OPTIONS = true;
+    // axis2 message context object or keep it local
+    private boolean DELEGATE_TO_AXISMC = true;
     
     /*
      * JAXWS runtime uses a request and response mc, but we need to know the pair.
@@ -83,7 +84,7 @@
     public MessageContext() {
         axisMsgCtx = new org.apache.axis2.context.MessageContext();
         isOutbound = true;
-        if (!DELEGATE_TO_OPTIONS) {
+        if (!DELEGATE_TO_AXISMC) {
             properties = new HashMap<String, Object>();
         }
            
@@ -96,7 +97,7 @@
      * @throws WebServiceException
      */
     public MessageContext(org.apache.axis2.context.MessageContext mc) throws WebServiceException {
-        if (!DELEGATE_TO_OPTIONS) {
+        if (!DELEGATE_TO_AXISMC) {
             properties = new HashMap<String, Object>();
         }
         // Assume inbound (caller must setOutbound)
@@ -128,32 +129,61 @@
     }
 
     public Map<String, Object> getProperties() {
-        if (DELEGATE_TO_OPTIONS) {
-            return new ReadOnlyProperties(axisMsgCtx.getOptions().getProperties());
+        if (DELEGATE_TO_AXISMC) {
+            // only use properties that are local to the axis2 MC,
+            // not the options bag.  See org.apache.axis2.context.AbstractContext
+            Iterator names = axisMsgCtx.getPropertyNames();
+            HashMap tempProps = new HashMap<String, Object>();
+            for (; names.hasNext();) {
+                String name = (String)names.next();
+                tempProps.put(name, axisMsgCtx.getProperty(name));
+            }
+            //return new ReadOnlyProperties(tempProps);
+            return tempProps;
         }
         return properties;
     }
     
     public void setProperties(Map<String, Object> _properties) {
-        if (DELEGATE_TO_OPTIONS) {
-            axisMsgCtx.getOptions().setProperties(_properties);
+        if (DELEGATE_TO_AXISMC) {
+            // make sure copy is made, not just reference:
+            _properties.put(org.apache.axis2.context.MessageContext.COPY_PROPERTIES, true);
+            axisMsgCtx.setProperties(_properties);
         } else {
             getProperties().putAll(_properties);
         }
     }
     
     public Object getProperty(String key) {
-        if (DELEGATE_TO_OPTIONS) {
-            return axisMsgCtx.getOptions().getProperty(key);
+        if (DELEGATE_TO_AXISMC) {
+            // only use properties that are local to the axis2 MC,
+            // not the options bag.  See org.apache.axis2.context.AbstractContext
+            Iterator names = axisMsgCtx.getPropertyNames();
+            for (; names.hasNext();) {
+                String name = (String)names.next();
+                if (name.equals(key)) {
+                    return axisMsgCtx.getProperty(key);
+                }
+            }
+            return null;
         }
         return getProperties().get(key);
     }
     
     // acts like Map.put(key, value)
     public Object setProperty(String key, Object value) {
-        if (DELEGATE_TO_OPTIONS) {
-            Object retval = axisMsgCtx.getOptions().getProperty(key);
-            axisMsgCtx.getOptions().setProperty(key, value);
+        if (DELEGATE_TO_AXISMC) {
+            // only use properties that are local to the axis2 MC,
+            // not the options bag.  See org.apache.axis2.context.AbstractContext
+            Object retval = null;
+            Iterator names = axisMsgCtx.getPropertyNames();
+            for (; names.hasNext();) {
+                String name = (String)names.next();
+                if (name.equals(key)) {
+                    retval = axisMsgCtx.getProperty(key);
+                }
+            }
+            axisMsgCtx.setProperty(key, value);
             return retval;
         } else {
             return getProperties().put(key, value);
@@ -223,7 +253,7 @@
     public boolean isMaintainSession() {
         boolean maintainSession = false;
 
-        Boolean value = (Boolean) getProperties().get(BindingProvider.SESSION_MAINTAIN_PROPERTY);
+        Boolean value = (Boolean) getProperty(BindingProvider.SESSION_MAINTAIN_PROPERTY);
         if (value != null && value.booleanValue()) {
             maintainSession = true;
         }
@@ -304,195 +334,5 @@
     public void setOutbound(boolean isOutbound) {
         this.isOutbound = isOutbound;
     }
-    
-    private class ReadOnlyProperties extends AbstractMap<String, Object> {
-        
-        private Map<String, Object> containedProps;
-        
-        public ReadOnlyProperties(Map containedProps) {
-            this.containedProps = containedProps;
-        }
-
-        @Override
-        public Set<Entry<String, Object>> entrySet() {
-            return new ReadOnlySet(containedProps.entrySet());
-        }
-
-        @Override
-        public Set<String> keySet() {
-            return new ReadOnlySet(containedProps.keySet());
-        }
-
-        @Override
-        public Object put(String key, Object value) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void putAll(Map<? extends String, ? extends Object> t) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Object remove(Object key) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Collection<Object> values() {
-            return new ReadOnlyCollection(containedProps.values());
-        }
-        
-        /*
-         * nested classes to be used to enforce read-only Collection, Set, and Iterator for MEPContext
-         */
-        
-        class ReadOnlyCollection implements Collection {
-            
-            private Collection containedCollection;
-            
-            private ReadOnlyCollection(Collection containedCollection) {
-                this.containedCollection = containedCollection;
-            }
-            
-            public boolean add(Object o) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean addAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public void clear() {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean contains(Object o) {
-                return containedCollection.contains(o);
-            }
-
-            public boolean containsAll(Collection c) {
-                return containedCollection.containsAll(c);
-            }
-
-            public boolean isEmpty() {
-                return containedCollection.isEmpty();
-            }
-
-            public Iterator iterator() {
-                return new ReadOnlyIterator(containedCollection.iterator());
-            }
-
-            public boolean remove(Object o) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean removeAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean retainAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public int size() {
-                return containedCollection.size();
-            }
-
-            public Object[] toArray() {
-                return containedCollection.toArray();
-            }
-
-            public Object[] toArray(Object[] a) {
-                return containedCollection.toArray(a);
-            }
-
-        }
-        
-        class ReadOnlyIterator implements Iterator {
-            
-            private Iterator containedIterator;
-            
-            private ReadOnlyIterator(Iterator containedIterator) {
-                this.containedIterator = containedIterator;
-            }
-            
-            // override remove() to make this Iterator class read-only
-            
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean hasNext() {
-                return containedIterator.hasNext();
-            }
-
-            public Object next() {
-                return containedIterator.next();
-            }
-        }
-        
-        class ReadOnlySet implements Set {
-
-            private Set containedSet;
-            
-            private ReadOnlySet(Set containedSet) {
-                this.containedSet = containedSet;
-            }
-            
-            public boolean add(Object o) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean addAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public void clear() {
-                throw new UnsupportedOperationException();
-            }
 
-            public boolean contains(Object o) {
-                return containedSet.contains(o);
-            }
-
-            public boolean containsAll(Collection c) {
-                return containedSet.containsAll(c);
-            }
-
-            public boolean isEmpty() {
-                return containedSet.isEmpty();
-            }
-
-            public Iterator iterator() {
-                return new ReadOnlyIterator(containedSet.iterator());
-            }
-
-            public boolean remove(Object o) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean removeAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public boolean retainAll(Collection c) {
-                throw new UnsupportedOperationException();
-            }
-
-            public int size() {
-                return containedSet.size();
-            }
-
-            public Object[] toArray() {
-                return containedSet.toArray();
-            }
-
-            public Object[] toArray(Object[] a) {
-                return containedSet.toArray(a);
-            }
-            
-        }
-        
-    }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/AxisInvocationController.java Fri Jul 27 14:58:51 2007
@@ -36,9 +36,9 @@
 import org.apache.axis2.jaxws.client.async.CallbackFuture;
 import org.apache.axis2.jaxws.client.async.PollingFuture;
 import org.apache.axis2.jaxws.core.InvocationContext;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.description.OperationDescription;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.factory.MessageFactory;
@@ -223,7 +223,7 @@
         // Setup the client so that it knows whether the underlying call to
         // Axis2 knows whether or not to start a listening port for an
         // asynchronous response.
-        Boolean useAsyncMep = (Boolean)request.getProperties().get(Constants.USE_ASYNC_MEP);
+        Boolean useAsyncMep = (Boolean)request.getProperty(Constants.USE_ASYNC_MEP);
         if ((useAsyncMep != null && useAsyncMep.booleanValue())
                 || opClient.getOptions().isUseSeparateListener()) {
             configureAsyncListener(opClient, request.getAxisMessageContext());
@@ -299,7 +299,7 @@
         // Setup the client so that it knows whether the underlying call to
         // Axis2 knows whether or not to start a listening port for an
         // asynchronous response.
-        Boolean useAsyncMep = (Boolean)request.getProperties().get(Constants.USE_ASYNC_MEP);
+        Boolean useAsyncMep = (Boolean)request.getProperty(Constants.USE_ASYNC_MEP);
         if ((useAsyncMep != null && useAsyncMep.booleanValue())
                 || opClient.getOptions().isUseSeparateListener()) {
             configureAsyncListener(opClient, request.getAxisMessageContext());
@@ -355,14 +355,6 @@
                     axisRequestMsgCtx // Axis 2 MessageContext
             );
 
-            // For now, just take all of the properties that were in the 
-            // JAX-WS MessageContext, and set them on the Axis2 MessageContext.
-            axisRequestMsgCtx.setProperty(AbstractContext.COPY_PROPERTIES,
-                                          Boolean.TRUE);
-            Map props = axisRequestMsgCtx.getOptions().getProperties();
-            props.putAll(requestMsgCtx.getProperties());
-
-            axisRequestMsgCtx.getOptions().setProperties(props);
             if (log.isDebugEnabled()) {
                 log.debug("Properties: " + axisRequestMsgCtx.getProperties().toString());
             }
@@ -385,7 +377,7 @@
     
     private void initOperationClient(OperationClient opClient, MessageContext requestMsgCtx) {
         org.apache.axis2.context.MessageContext axisRequest = requestMsgCtx.getAxisMessageContext();
-        setupProperties(requestMsgCtx, axisRequest.getOptions());
+        setupProperties(requestMsgCtx);//, axisRequest.getOptions());
 
         if (opClient != null) {
             Options options = opClient.getOptions();
@@ -393,7 +385,7 @@
             // Get the target endpoint address and setup the TO endpoint 
             // reference.  This tells us where the request is going.
             if (options.getTo() == null) {
-                String targetUrl = (String)requestMsgCtx.getProperties().get(
+                String targetUrl = (String)requestMsgCtx.getProperty(
                         BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
                 EndpointReference toEPR = new EndpointReference(targetUrl);
                 options.setTo(toEPR);
@@ -487,23 +479,18 @@
     * moved over to when the property is set.  This should not be in the path
     * of performance.
     */
-    private void setupProperties(MessageContext mc, Options ops) {
+    private void setupProperties(MessageContext mc) {//, Options ops) {
         Map<String, Object> properties = mc.getProperties();
-        for (Iterator<String> it = properties.keySet().iterator(); it.hasNext();) {
-            String key = it.next();
-            Object value = properties.get(key);
-            ops.setProperty(key, value);
-        }
 
         // Enable MTOM
         Message msg = mc.getMessage();
         if (msg.isMTOMEnabled()) {
-            ops.setProperty(Configuration.ENABLE_MTOM, "true");
+            mc.setProperty(Configuration.ENABLE_MTOM, "true");
         }
 
         // Enable session management
         if (mc.isMaintainSession()) {
-            ops.setManageSession(true);
+            mc.getAxisMessageContext().getOptions().setManageSession(true);
         }
 
         // Check to see if BASIC_AUTH is enabled.  If so, make sure
@@ -540,7 +527,7 @@
             basicAuthentication.setPort(url.getPort());
             basicAuthentication.setPreemptiveAuthentication(true);
 
-            ops.setProperty(HTTPConstants.AUTHENTICATE, basicAuthentication);
+            mc.setProperty(HTTPConstants.AUTHENTICATE, basicAuthentication);
         } else if ((!properties.containsKey(BindingProvider.USERNAME_PROPERTY) &&
                 properties.containsKey(BindingProvider.PASSWORD_PROPERTY)) ||
                 (properties.containsKey(BindingProvider.USERNAME_PROPERTY) &&

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/InvocationController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/InvocationController.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/InvocationController.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/InvocationController.java Fri Jul 27 14:58:51 2007
@@ -154,7 +154,7 @@
      *
      * @param ic
      */
-    public void invokeOneWay(InvocationContext ic) {
+    public void invokeOneWay(InvocationContext ic) throws Exception {
         if (log.isDebugEnabled()) {
             log.debug("Invocation pattern: one-way");
         }
@@ -181,6 +181,13 @@
         if (success) {
             prepareRequest(request);
             doInvokeOneWay(request);
+        } else { // the outbound handler chain must have had a problem, and we've reversed directions
+            // check to see if problem is due to a handler throwing an exception.  If so, throw it,
+            // even in this oneWay invoke.
+            Exception e = request.getCausedByException();
+            if (e != null) {
+                throw (Exception)e.getCause();
+            }
         }
         return;
     }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerChainProcessor.java Fri Jul 27 14:58:51 2007
@@ -18,24 +18,8 @@
  */
 package org.apache.axis2.jaxws.handler;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.apache.axis2.jaxws.core.MEPContext;
-import java.util.List;
-
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.ProtocolException;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.Handler;
-import javax.xml.ws.handler.LogicalHandler;
-import javax.xml.ws.handler.soap.SOAPHandler;
-
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.context.factory.MessageContextFactory;
-import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.marshaller.impl.alt.MethodMarshallerUtils;
 import org.apache.axis2.jaxws.message.Message;
@@ -48,6 +32,20 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.ProtocolException;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.LogicalHandler;
+import javax.xml.ws.handler.soap.SOAPHandler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 public class HandlerChainProcessor {
 
     private static final Log log = LogFactory.getLog(HandlerChainProcessor.class);
@@ -279,11 +277,12 @@
                 } else {
                     callCloseHandlers(0, handlers.size() - 1, direction);
                 }
-                if (savedException != null) {
-                    // we have a saved exception, throw it (JAX-WS 9.3.2.1 "Throw any
-                    // other runtime exception --> No response" case.
-                    throw savedException;
-                }
+            }
+            if (savedException != null) {
+                // we have a saved exception, throw it (JAX-WS 9.3.2.1 "Throw 
+                // ProtocolException or any other runtime exception --> No 
+                // response" case.
+                throw savedException;
             }
         }
     }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerInvokerUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerInvokerUtils.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerInvokerUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/HandlerInvokerUtils.java Fri Jul 27 14:58:51 2007
@@ -18,8 +18,7 @@
  */
 package org.apache.axis2.jaxws.handler;
 
-import org.apache.axis2.jaxws.core.MEPContext;
-import org.apache.axis2.jaxws.core.MessageContext;
+import org.apache.axis2.AxisFault;
 import org.apache.axis2.jaxws.message.Protocol;
 
 import javax.xml.ws.handler.Handler;
@@ -118,11 +117,17 @@
             }
         } catch (RuntimeException re) {
             /*
-             * handler framework should only throw an exception here if
-             * we are in the server outbound case.  Make sure the message
-             * context and message are transformed.
+             * handler framework will throw an exception here on client outbound flow and
+             * server outbound flow.  Make sure the message context and message are transformed
+             * and the exception is saved on the message context.
              */
             HandlerChainProcessor.convertToFaultMessage(mepMessageCtx, re, proto);
+            if (mepMessageCtx.getRequestMessageContext() != null) {
+                mepMessageCtx.getRequestMessageContext().setCausedByException(new AxisFault("", re));
+            }
+            if (mepMessageCtx.getResponseMessageContext() != null) {
+                mepMessageCtx.getResponseMessageContext().setCausedByException(new AxisFault("", re));
+            }
             return false;
         }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageContext.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageContext.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageContext.java Fri Jul 27 14:58:51 2007
@@ -18,9 +18,7 @@
  */
 package org.apache.axis2.jaxws.handler;
 
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.Message;
 
 import javax.xml.ws.LogicalMessage;
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/LogicalMessageImpl.java Fri Jul 27 14:58:51 2007
@@ -18,10 +18,21 @@
  */
 package org.apache.axis2.jaxws.handler;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
+import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axis2.jaxws.ExceptionFactory;
+import org.apache.axis2.jaxws.message.Block;
+import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
+import org.apache.axis2.jaxws.message.factory.BlockFactory;
+import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
+import org.apache.axis2.jaxws.message.factory.MessageFactory;
+import org.apache.axis2.jaxws.message.factory.SourceBlockFactory;
+import org.apache.axis2.jaxws.registry.FactoryRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.parsers.DocumentBuilder;
@@ -40,27 +51,11 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.LogicalMessage;
-import javax.xml.ws.WebServiceException;
 
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.SOAPFault;
-import org.apache.axis2.jaxws.ExceptionFactory;
-import org.apache.axis2.jaxws.core.MEPContext;
-import org.apache.axis2.jaxws.message.Block;
-import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.databinding.JAXBBlockContext;
-import org.apache.axis2.jaxws.message.factory.BlockFactory;
-import org.apache.axis2.jaxws.message.factory.JAXBBlockFactory;
-import org.apache.axis2.jaxws.message.factory.MessageFactory;
-import org.apache.axis2.jaxws.message.factory.SourceBlockFactory;
-import org.apache.axis2.jaxws.registry.FactoryRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
 
 public class LogicalMessageImpl implements LogicalMessage {
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java Fri Jul 27 14:58:51 2007
@@ -20,12 +20,10 @@
 
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.message.Message;
+import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.activation.DataHandler;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -107,6 +105,12 @@
             tha.putAll((Map) map);
         }
         mc.setProperty(propertyName, tha);
+        
+        // If this is a response, then also set the property for the response code
+        if (!isRequest) {
+            Object value = mc.getProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
+            mc.setProperty(javax.xml.ws.handler.MessageContext.HTTP_RESPONSE_CODE, value);
+        }
     }
 
     /**
@@ -229,5 +233,9 @@
         Map tempMap = new HashMap<String, List<String>>();
         tempMap.putAll(this);
         return tempMap.entrySet();
+    }
+    
+    public String toString() {
+        return "TransportHeadersAdapter: " + getDelegateMap(mc).toString();        
     }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/AttachmentUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/AttachmentUtils.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/AttachmentUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/AttachmentUtils.java Fri Jul 27 14:58:51 2007
@@ -18,6 +18,8 @@
  */
 package org.apache.axis2.jaxws.message.attachments;
 
+import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.attachments.CachedFileDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
@@ -28,7 +30,10 @@
 import org.apache.commons.logging.LogFactory;
 
 import javax.activation.DataHandler;
+import javax.activation.DataSource;
 import javax.xml.namespace.QName;
+
+import java.io.File;
 import java.util.ArrayList;
 
 /** A suite of utilities used for handling MTOM attachment data. */
@@ -177,6 +182,43 @@
         OMElement xop = factory.createOMElement(XOP_INCLUDE, null);
         xop.addAttribute("href", data.getContentID(), null);
         return xop;
+    }
+    
+    /**
+     * Process attachment's dataHandlers for CachedFileDataSource.
+     * If exist, execute file.deleteOnExit() request on the cached
+     * attachment file referenced by each CachedFileDataSource.
+     * This will delete the cached attachment file on JVM exit.
+     * 
+     * @param attachments
+     */
+    public static void findCachedAttachment(Attachments attachments){
+    	if(attachments == null){
+    		return;
+    	}
+    	
+    	String[] contentIds = attachments.getAllContentIDs();
+    	if(contentIds.length > 0){
+            if (log.isDebugEnabled()) {
+            	log.debug("Attachments exist....");
+            }
+        	for(int i=0; i < contentIds.length; i++){
+        		DataHandler dh = attachments.getDataHandler(contentIds[i]);
+        		if(dh != null){
+        			DataSource dataSource = dh.getDataSource();
+        			if(dh != null && dataSource instanceof CachedFileDataSource){
+        				if (log.isDebugEnabled()) {
+                        	log.debug("Attachment's DataHandler uses CachedFileDataSource...");
+                        }
+                    	File file = ((CachedFileDataSource)dataSource).getFile();
+                    	if (log.isDebugEnabled()) {
+                        	log.debug(" Making file.deleteOnExit() request on "+file.getAbsolutePath());
+                        }
+                    	file.deleteOnExit();
+                    }
+        		}
+        	}
+        }
     }
 
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/MessageImpl.java Fri Jul 27 14:58:51 2007
@@ -22,7 +22,6 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axis2.Constants.Configuration;
-import org.apache.axis2.client.Options;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.i18n.Messages;
@@ -31,6 +30,7 @@
 import org.apache.axis2.jaxws.message.Protocol;
 import org.apache.axis2.jaxws.message.XMLFault;
 import org.apache.axis2.jaxws.message.XMLPart;
+import org.apache.axis2.jaxws.message.attachments.AttachmentUtils;
 import org.apache.axis2.jaxws.message.factory.BlockFactory;
 import org.apache.axis2.jaxws.message.factory.SAAJConverterFactory;
 import org.apache.axis2.jaxws.message.factory.SOAPEnvelopeBlockFactory;
@@ -598,8 +598,7 @@
             if (!isMTOMEnabled()) {
                 String[] cids = newMap.getAllContentIDs();
                 if (cids.length > 0) {
-                    Options opts = messageContext.getAxisMessageContext().getOptions();
-                    opts.setProperty(Configuration.ENABLE_SWA, "true");
+                    messageContext.setProperty(Configuration.ENABLE_SWA, "true");
                 }
             }
             if (log.isDebugEnabled()) {
@@ -609,6 +608,12 @@
             }
             attachments = newMap;
         }
+        
+        // Check for cached attachment file(s) if attachments exist.
+        if(attachments != null && !messageContext.getAxisMessageContext().isServerSide()){
+        	AttachmentUtils.findCachedAttachment(attachments);
+        }
+        
         this.messageContext = messageContext;
     }
     public void setDoingSWA(boolean value) {

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/message/util/MessageUtils.java Fri Jul 27 14:58:51 2007
@@ -34,7 +34,6 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.Constants.Configuration;
-import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.jaxws.ExceptionFactory;
 import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
@@ -211,15 +210,13 @@
         if (message.isDoingSWA()) {
             // Enable SWA on the Axis2 MessageContext
             msgContext.setDoingSwA(true);
-            Options opts = msgContext.getOptions();
-            opts.setProperty(Configuration.ENABLE_SWA, "true");
+            msgContext.setProperty(Configuration.ENABLE_SWA, "true");
         }
 
         // Enable MTOM Attachments 
         if (message.isMTOMEnabled()) {
             // Enable MTOM on the Axis2 MessageContext
-            Options opts = msgContext.getOptions();
-            opts.setProperty(Configuration.ENABLE_MTOM, "true");
+            msgContext.setProperty(Configuration.ENABLE_MTOM, "true");
             if (false) {
                 makeBinaryNodes(message);
             }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/EndpointController.java Fri Jul 27 14:58:51 2007
@@ -36,6 +36,7 @@
 import org.apache.axis2.jaxws.handler.HandlerChainProcessor;
 import org.apache.axis2.jaxws.handler.HandlerInvokerUtils;
 import org.apache.axis2.jaxws.handler.HandlerResolverImpl;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.Protocol;

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java Fri Jul 27 14:58:51 2007
@@ -30,9 +30,9 @@
 import org.apache.axis2.jaxws.core.InvocationContext;
 import org.apache.axis2.jaxws.core.InvocationContextFactory;
 import org.apache.axis2.jaxws.core.InvocationContextImpl;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.handler.TransportHeadersAdapter;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.axis2.jaxws.message.util.MessageUtils;

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/spi/migrator/ApplicationContextMigratorUtil.java Fri Jul 27 14:58:51 2007
@@ -20,24 +20,24 @@
 
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.jaxws.ExceptionFactory;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.core.util.MessageContextUtils;
 import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
+import javax.xml.ws.handler.MessageContext.Scope;
+
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
-import javax.xml.ws.handler.MessageContext.Scope;
 
 public class ApplicationContextMigratorUtil {
 

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/framework/JAXWSTest.java Fri Jul 27 14:58:51 2007
@@ -30,6 +30,7 @@
 import org.apache.axis2.jaxws.client.DispatchSoapActionTests;
 import org.apache.axis2.jaxws.client.PropertyValueTests;
 import org.apache.axis2.jaxws.client.ProxySoapActionTests;
+import org.apache.axis2.jaxws.core.MessageContextTests;
 import org.apache.axis2.jaxws.databinding.BindingToProtocolTests;
 import org.apache.axis2.jaxws.description.AnnotationDescriptionTests;
 import org.apache.axis2.jaxws.description.GetDescFromBindingProviderTests;
@@ -59,6 +60,7 @@
 import org.apache.axis2.jaxws.provider.JAXBProviderTests;
 import org.apache.axis2.jaxws.provider.SOAPFaultProviderTests;
 import org.apache.axis2.jaxws.provider.SoapMessageProviderTests;
+import org.apache.axis2.jaxws.provider.SoapMessageMUProviderTests;
 import org.apache.axis2.jaxws.provider.SourceMessageProviderTests;
 import org.apache.axis2.jaxws.provider.SourceProviderTests;
 import org.apache.axis2.jaxws.provider.StringMessageProviderTests;
@@ -124,6 +126,7 @@
         
         suite.addTestSuite(BlockTests.class);
         suite.addTestSuite(MessageTests.class);
+        suite.addTestSuite(MessageContextTests.class);
         suite.addTestSuite(FaultTests.class);
         suite.addTestSuite(SAAJConverterTests.class);
         suite.addTestSuite(SOAP12Tests.class);
@@ -156,6 +159,7 @@
         suite.addTestSuite(SourceMessageProviderTests.class);
         // TODO FIXME: Test fails
         //suite.addTestSuite(SoapMessageProviderTests.class);
+        suite.addTestSuite(SoapMessageMUProviderTests.class);
         suite.addTestSuite(JAXBProviderTests.class);
         suite.addTestSuite(ProxyTests.class);
         //TODO: FIXME - Was working, now doesn't

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerChainProcessorTests.java Fri Jul 27 14:58:51 2007
@@ -29,7 +29,6 @@
 
 import junit.framework.TestCase;
 
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.message.Protocol;
 
@@ -563,7 +562,6 @@
         // reset result
         result = "";
 
-        // we want one false response:
         soaphandler1_MessageResultDesired = ResultDesired.TRUE;
         soaphandler1_FaultResultDesired = ResultDesired.TRUE;
         soaphandler2_MessageResultDesired = ResultDesired.TRUE;
@@ -576,11 +574,16 @@
         HandlerChainProcessor processor = new HandlerChainProcessor(handlers, Protocol.soap11);
         MessageContext mc1 = new MessageContext();
         mc1.setMEPContext(new MEPContext(mc1));
-        processor.processChain(mc1.getMEPContext(),
-                               HandlerChainProcessor.Direction.IN,
-                               HandlerChainProcessor.MEP.REQUEST,
-                               false);
-
+        Exception e = null;
+        try {
+            processor.processChain(mc1.getMEPContext(),
+                                   HandlerChainProcessor.Direction.IN,
+                                   HandlerChainProcessor.MEP.REQUEST,
+                                   false);
+        } catch (ProtocolException pe) {
+            e = pe;
+        }
+        assertNotNull(e);
         // no handleFault calls
         assertEquals("S2m:S1m:L1m:L1c:S1c:S2c:", result);
     }

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/CompositeMessageContextTests.java Fri Jul 27 14:58:51 2007
@@ -32,7 +32,7 @@
 
 import org.apache.axis2.jaxws.context.factory.MessageContextFactory;
 import org.apache.axis2.jaxws.core.MessageContext;
-import org.apache.axis2.jaxws.core.MEPContext;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.handler.SoapMessageContext;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.Protocol;

Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java?view=diff&rev=560397&r1=560396&r2=560397
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/handler/context/LogicalMessageContextTests.java Fri Jul 27 14:58:51 2007
@@ -34,8 +34,8 @@
 import junit.framework.TestCase;
 
 import org.apache.axis2.jaxws.context.factory.MessageContextFactory;
-import org.apache.axis2.jaxws.core.MEPContext;
 import org.apache.axis2.jaxws.core.MessageContext;
+import org.apache.axis2.jaxws.handler.MEPContext;
 import org.apache.axis2.jaxws.message.Block;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.axis2.jaxws.message.Protocol;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message