You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/03/23 16:16:32 UTC
svn commit: r1304429 - in
/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice:
client/CustomerServiceSpringClient.java
server/CustomerServiceSpringServer.java
Author: dkulp
Date: Fri Mar 23 15:16:31 2012
New Revision: 1304429
URL: http://svn.apache.org/viewvc?rev=1304429&view=rev
Log:
Merged revisions 1304374 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1304374 | dkulp | 2012-03-23 10:33:52 -0400 (Fri, 23 Mar 2012) | 2 lines
Cleanup the spring contexts
........
Modified:
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java?rev=1304429&r1=1304428&r2=1304429&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java Fri Mar 23 15:16:31 2012
@@ -34,6 +34,8 @@ public final class CustomerServiceSpring
CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
client.testCustomerService();
- System.exit(0);
+ context.stop();
+ context.destroy();
+ //System.exit(0);
}
}
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java?rev=1304429&r1=1304428&r2=1304429&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java Fri Mar 23 15:16:31 2012
@@ -26,7 +26,9 @@ public class CustomerServiceSpringServer
}
public static void main(String args[]) throws Exception {
- new ClassPathXmlApplicationContext("server-applicationContext.xml");
+ ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("server-applicationContext.xml");
System.in.read();
+ ctx.stop();
+ ctx.destroy();
}
}