Author: ningjiang
Date: Tue Dec 28 02:42:34 2010
New Revision: 1053243
URL: http://svn.apache.org/viewvc?rev=1053243&view=rev
Log:
Merged revisions 1052990,1053239 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1052990 | dkulp | 2010-12-27 11:03:10 +0800 (Mon, 27 Dec 2010) | 1 line
Update to latest surefire
........
r1053239 | ningjiang | 2010-12-28 09:49:04 +0800 (Tue, 28 Dec 2010) | 1 line
Revert the change of PolicyAnnotationTest
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/pom.xml
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 28 02:42:34 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052993-1052994,1052996-1052997,1053114,1053119,1053123
+/cxf/trunk:1041183,1041790,1041993,1042346,1042571,1042724,1042805,1042821,1043225,1043229,1043902,1043907,1043954,1044085,1044238-1044305,1045024,1048915,1048919,1048930,1049078,1049426,1049937,1050005,1050021,1050095,1050102,1050113,1050156,1050165,1050280,1051115,1051613,1051790,1051792,1052338,1052516,1052541,1052990,1052993-1052994,1052996-1052997,1053114,1053119,1053123,1053239
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/pom.xml?rev=1053243&r1=1053242&r2=1053243&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/pom.xml Tue Dec 28 02:42:34 2010
@@ -491,7 +491,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java?rev=1053243&r1=1053242&r2=1053243&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java
Tue Dec 28 02:42:34 2010
@@ -53,8 +53,6 @@ public class PolicyAnnotationTest extend
@org.junit.Test
public void testAnnotations() throws Exception {
- // Need to clean up the Default Bus instance frist
- BusFactory.setDefaultBus(null);
Bus bus = BusFactory.getDefaultBus();
JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
factory.setBus(bus);
Modified:
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java?rev=1053243&r1=1053242&r2=1053243&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyEngineImplInitTest.java
Tue Dec 28 02:42:34 2010
@@ -24,6 +24,7 @@ import javax.annotation.Resource;
import org.apache.cxf.Bus;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -50,6 +51,11 @@ public class PolicyEngineImplInitTest {
public void setUp() throws Exception {
assertNotNull(pe);
}
+
+ @After
+ public void tearDown() throws Exception {
+ bus.shutdown(true);
+ }
@Test
public void testPolicyInterceptors() throws Exception {
