cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1209214 - in /cxf/branches/2.4.x-fixes: ./ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
Date Thu, 01 Dec 2011 20:02:24 GMT
Author: dkulp
Date: Thu Dec  1 20:02:23 2011
New Revision: 1209214

URL: http://svn.apache.org/viewvc?rev=1209214&view=rev
Log:
Merged revisions 1208687 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1208687 | ay | 2011-11-30 13:41:02 -0500 (Wed, 30 Nov 2011) | 1 line
  
  add another two endpoints two buses wiring test
........

Added:
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
      - copied unchanged from r1208687, cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints2.xml
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java?rev=1209214&r1=1209213&r2=1209214&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/SpringBeansTest.java
Thu Dec  1 20:02:23 2011
@@ -398,5 +398,38 @@ public class SpringBeansTest extends Ass
 
     }
 
+    @Test
+    public void testTwoEndpointsWithTwoBuses() throws Exception {
+        ClassPathXmlApplicationContext ctx = null;
+        Bus cxf1 = null;
+        Bus cxf2 = null;
+        try {
+            ctx = new ClassPathXmlApplicationContext("/org/apache/cxf/jaxws/spring/endpoints2.xml");
+            EndpointImpl ep1 = (EndpointImpl) ctx.getBean("ep1");
+            assertNotNull(ep1);
+            cxf1 = (Bus) ctx.getBean("cxf1");
+            assertNotNull(cxf1);
+            assertEquals(cxf1, ep1.getBus());
+            assertEquals("barf", ep1.getBus().getProperty("foo"));            
+
+            EndpointImpl ep2 = (EndpointImpl) ctx.getBean("ep2");
+            assertNotNull(ep2);
+            cxf2 = (Bus) ctx.getBean("cxf2");
+            assertNotNull(cxf2);
+            assertEquals(cxf2, ep2.getBus());
+            assertEquals("snarf", ep2.getBus().getProperty("foo"));            
+
+        } finally {
+            if (cxf1 != null) {
+                cxf1.shutdown(true);
+            }
+            if (cxf2 != null) {
+                cxf2.shutdown(true);
+            }
+            if (ctx != null) {
+                ctx.close();
+            }
+        }
+    }
 }
 



Mime
View raw message