cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1197050 - in /cxf/branches/2.4.x-fixes: ./ tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java tools/wadlto/jaxrs/src/test/resources/wadl/multipleResources.xml
Date Thu, 03 Nov 2011 10:23:30 GMT
Author: sergeyb
Date: Thu Nov  3 10:23:29 2011
New Revision: 1197050

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

........
  r1197048 | sergeyb | 2011-11-03 10:19:58 +0000 (Thu, 03 Nov 2011) | 1 line
  
  Adding a missing file, sorry
........

Added:
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/multipleResources.xml
      - copied unchanged from r1197048, cxf/trunk/tools/wadlto/jaxrs/src/test/resources/wadl/multipleResources.xml
Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1197048

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

Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java?rev=1197050&r1=1197049&r2=1197050&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
(original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
Thu Nov  3 10:23:29 2011
@@ -28,7 +28,6 @@ import org.apache.cxf.tools.common.Proce
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.wadlto.WadlToolConstants;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class JAXRSContainerTest extends ProcessorTestBase {
@@ -301,7 +300,6 @@ public class JAXRSContainerTest extends 
     }
     
     @Test    
-    @Ignore("missing a file")
     public void testCodeGenNoIds2() {
         try {
             JAXRSContainer container = new JAXRSContainer(null);



Mime
View raw message