svn commit: r1350578 - in /axis/axis2/java/core/trunk/modules: integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/mtom/ jaxws-mar/src/org/apache/axis2/jaxws/module/ transport/http/src/org/apache/axis2/transport/http/

[sagara]

Author: sagara
Date: Fri Jun 15 11:18:46 2012
New Revision: 1350578

URL: http://svn.apache.org/viewvc?rev=1350578&view=rev
Log:
AXIS2-5315 - More code cleanups, removed another set of deprecated methods.

Modified:
    
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
    
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
    
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
    
axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java
    
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/SOAPversionTest.java
 Fri Jun 15 11:18:46 2012
@@ -39,7 +39,6 @@ public class SOAPversionTest extends Loc
         ServiceClient serviceClient = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
         serviceClient.getOptions().setSoapVersionURI(
                 SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-        serviceClient.setCachingOperationContext(true);
         serviceClient.sendReceive(TestingUtils.createDummyOMElement());
         SOAPEnvelope result = 
serviceClient.getLastOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
 
@@ -51,8 +50,7 @@ public class SOAPversionTest extends Loc
     public void testSOAP12() throws AxisFault {
         ServiceClient serviceClient = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
         serviceClient.getOptions().setSoapVersionURI(
-                       SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-        serviceClient.setCachingOperationContext(true);
+                       SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);   
         serviceClient.sendReceive(TestingUtils.createDummyOMElement());
         SOAPEnvelope result = 
serviceClient.getLastOperationContext().getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE).getEnvelope();
         

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/engine/UsingTransportTest.java
 Fri Jun 15 11:18:46 2012
@@ -37,8 +37,7 @@ public class UsingTransportTest extends 
 
     public void testSOAPVersioning() throws Exception{
        ServiceClient sender = getClient(Echo.SERVICE_NAME, 
Echo.ECHO_OM_ELEMENT_OP_NAME);
-       
sender.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
-       sender.setCachingOperationContext(true);
+       
sender.getOptions().setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
     
        OMElement response = 
sender.sendReceive(TestingUtils.createDummyOMElement());
        TestingUtils.compareWithCreatedOMElement(response);
        SOAPEnvelope result =

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
 Fri Jun 15 11:18:46 2012
@@ -207,7 +207,7 @@ public class EchoRawMTOMTest extends Uti
                         
TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), 
null);
 
         ServiceClient sender = new ServiceClient(configContext, null);
-        sender.engageModule(new QName("addressing"));
+        sender.engageModule("addressing");
         options.setAction(Constants.AXIS2_NAMESPACE_URI + "/" + 
operationName.getLocalPart());
         sender.setOptions(options);
         options.setUseSeparateListener(true);

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-mar/src/org/apache/axis2/jaxws/module/JAXWSModule.java
 Fri Jun 15 11:18:46 2012
@@ -48,7 +48,7 @@ public class JAXWSModule implements Modu
     }
 
     private void registerGlobalModule(AxisConfiguration axisConfiguration, 
String moduleName) {
-        if (!axisConfiguration.getGlobalModules().contains(moduleName)) {
+        if (!axisConfiguration.isGlobalModulesRegistered(moduleName)) {
             axisConfiguration.addGlobalModuleRef(moduleName);
         }
     }

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java?rev=1350578&r1=1350577&r2=1350578&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportReceiver.java
 Fri Jun 15 11:18:46 2012
@@ -166,7 +166,7 @@ public class HTTPTransportReceiver {
             Iterator iterator = axisService.getOperations();
             temp += "<h3>" + axisService.getName() + "</h3>";
             temp += "<a href=\"" + axisService.getName() + "?wsdl\">wsdl</a> 
<br/> ";
-            temp += "<i>Service Description :  " + 
axisService.getServiceDescription() +
+            temp += "<i>Service Description :  " + 
axisService.getDocumentation() +
                     "</i><br/><br/>";
             if (iterator.hasNext()) {
                 temp += "Available operations <ul>";