svn commit: r1349841 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

[sergeyb]

Author: sergeyb
Date: Wed Jun 13 13:42:28 2012
New Revision: 1349841

URL: http://svn.apache.org/viewvc?rev=1349841&view=rev
Log:
Merged revisions 1349839 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1349839 | sergeyb | 2012-06-13 14:40:23 +0100 (Wed, 13 Jun 2012) | 1 line
  
  Fixing the test as JAXB schema compiler does not handle XmlNs correctly in 
Java5
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.6.x-fixes:r1349839

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

Modified: 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java?rev=1349841&r1=1349840&r2=1349841&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorTest.java
 Wed Jun 13 13:42:28 2012
@@ -365,7 +365,7 @@ public class WadlGeneratorTest extends A
         int size = book2El == null ? 2 : 3;
         
         assertEquals(size, elementEls.size());
-        String prefix = !customPrefix ? "tns" : "os";
+        String prefix = "tns";
         assertTrue(checkElement(elementEls, bookEl, prefix + ":book"));
         if (book2El != null) {
             assertTrue(checkElement(elementEls, book2El, prefix + ":book2"));