svn commit: r1231152 - /axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java

[sagara]

Author: sagara
Date: Fri Jan 13 16:13:08 2012
New Revision: 1231152

URL: http://svn.apache.org/viewvc?rev=1231152&view=rev
Log:
Modified test case according to AXIS2-5231 changes. 

Modified:
    
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java?rev=1231152&r1=1231151&r2=1231152&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/spring/SpringServiceTest.java
 Fri Jan 13 16:13:08 2012
@@ -41,11 +41,11 @@ import org.apache.axis2.description.Para
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import 
org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier;
+import org.apache.axis2.extensions.spring.util.ApplicationContextUtil;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLOutputFactory;
@@ -57,8 +57,6 @@ public class SpringServiceTest extends U
                                               "NullTransport");
     EndpointReference targetEPR = new EndpointReference(
             "http://127.0.0.1:"; + (UtilServer.TESTING_PORT)
-//            "http://127.0.0.1:"; + 5556
-                    //  + "/axis2/services/EchoXMLService/echoOMElement");
                     + "/axis2/services/SpringExample/getValue");
 
     protected AxisConfiguration engineRegistry;
@@ -79,8 +77,7 @@ public class SpringServiceTest extends U
                 createSpringService(springServiceName, new 
RawXMLINOutMessageReceiver(),
                                     
"org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier",
                                     "springAwareService",
-                                    springOperationName);
-        createSpringAppCtx(service.getClassLoader());
+                                    springOperationName);      
         UtilServer.deployService(service);
     }
 
@@ -141,6 +138,8 @@ public class SpringServiceTest extends U
         service.addParameter(new Parameter(Constants.SERVICE_TCCL, 
Constants.TCCL_COMPOSITE));
         service.addParameter(new Parameter(
                 SpringAppContextAwareObjectSupplier.SERVICE_SPRING_BEANNAME, 
beanName));
+        service.addParameter(new Parameter(
+                ApplicationContextUtil.SPRING_APPLICATION_CONTEXT_LOCATION , 
"/spring/applicationContext.xml"));
 
         AxisOperation axisOp = new InOutAxisOperation(opName);
 
@@ -174,14 +173,5 @@ public class SpringServiceTest extends U
         service.addOperation(axisOp);
 
         return service;
-    }
-
-    public void createSpringAppCtx(ClassLoader cl)
-            throws Exception {
-
-        ClassPathXmlApplicationContext ctx = new 
ClassPathXmlApplicationContext(
-                new String[] { "/spring/applicationContext.xml" }, false);
-        ctx.setClassLoader(cl);
-        ctx.refresh();
-    }
+    }    
 }