Author: dkulp
Date: Fri Jul 24 18:03:48 2009
New Revision: 797586
URL: http://svn.apache.org/viewvc?rev=797586&view=rev
Log:
Merged revisions 797583 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r797583 | dkulp | 2009-07-24 13:59:31 -0400 (Fri, 24 Jul 2009) | 2 lines
Fix test failures with latest JAXB and test interaction issues due to
state carrying over from test to test
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisProviderTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 24 18:03:48 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797582
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java?rev=797586&r1=797585&r2=797586&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
Fri Jul 24 18:03:48 2009
@@ -41,6 +41,7 @@
implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
private static Map<Class<?>, AegisContext> classContexts = new
WeakHashMap<Class<?>, AegisContext>();
+
protected boolean writeXsiType = true;
protected boolean readXsiType = true;
@Context
@@ -130,7 +131,7 @@
return true;
}
- void clearContexts() {
+ static void clearContexts() {
classContexts.clear();
}
}
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java?rev=797586&r1=797585&r2=797586&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JSONProvider.java
Fri Jul 24 18:03:48 2009
@@ -404,6 +404,8 @@
lastText += text;
} else if (!isMixed) {
super.writeCharacters(text);
+ } else {
+ lastText = text;
}
}
@@ -435,8 +437,8 @@
super.writeStartElement(local);
}
public void writeEndElement() throws XMLStreamException {
- if (lastText != null && !isMixed) {
- super.writeCharacters(lastText);
+ if (lastText != null && (!isMixed ||
!StringUtils.isEmpty(lastText.trim()))) {
+ super.writeCharacters(lastText.trim());
}
super.writeEndElement();
isMixed = mixed.get(0);
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java?rev=797586&r1=797585&r2=797586&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisJSONProviderTest.java
Fri Jul 24 18:03:48 2009
@@ -107,7 +107,7 @@
private void doTestWriteTo(String data, boolean writeXsi, boolean
setNsMap) throws Exception {
AegisJSONProvider p = new AegisJSONProvider();
- p.clearContexts();
+ AbstractAegisProvider.clearContexts();
p.setWriteXsiType(writeXsi);
if (setNsMap) {
Map<String, String> namespaceMap = new HashMap<String, String>();
@@ -131,7 +131,7 @@
@Test
public void testManyTags() throws Exception {
AegisJSONProvider p = new AegisJSONProvider();
- p.clearContexts();
+ AbstractAegisProvider.clearContexts();
p.setWriteXsiType(false);
p.setSerializeAsArray(true);
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisProviderTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisProviderTest.java?rev=797586&r1=797585&r2=797586&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisProviderTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AegisProviderTest.java
Fri Jul 24 18:03:48 2009
@@ -31,6 +31,7 @@
import org.apache.cxf.jaxrs.fortest.AegisTestBean;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -43,6 +44,11 @@
+
"<ns1:boolValue>true</ns1:boolValue><ns1:strValue>hovercraft</ns1:strValue>"
+ "</ns1:AegisTestBean>";
+ @After
+ public void clearCache() {
+ AbstractAegisProvider.clearContexts();
+ }
+
@Test
public void testIsWriteable() {
MessageBodyWriter<Object> p = new AegisElementProvider();
