svn commit: r1568202 - /tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

[rmannibucau]

Author: rmannibucau
Date: Fri Feb 14 07:05:25 2014
New Revision: 1568202

URL: http://svn.apache.org/r1568202
Log:
TOMEE-1121 adding openejb.cxf-rs.wadl-generator.ignoreRequests

Modified:
    
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java

Modified: 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1568202&r1=1568201&r2=1568202&view=diff
==============================================================================
--- 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Fri Feb 14 07:05:25 2014
@@ -120,21 +120,18 @@ public class CxfRsHttpListener implement
         STATIC_CONTENT_TYPES.put("pdf", "application/pdf");
         STATIC_CONTENT_TYPES.put("xsd", "application/xml");
 
-        // CXF-5319: bug in CXF? it prevents to get the wadl as json otherwise
-        if 
("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreMessageWriters",
 "false"))) {
-            for (final ProviderInfo<RequestHandler> rh : 
org.apache.cxf.jaxrs.provider.ProviderFactory.getSharedInstance().getRequestHandlers())
 {
-                final RequestHandler provider = rh.getProvider();
-                if (WadlGenerator.class.isInstance(provider)) {
-                    
WadlGenerator.class.cast(provider).setIgnoreMessageWriters(false);
-                }
-            }
-        }
-
         for (final ProviderInfo<RequestHandler> rh : 
org.apache.cxf.jaxrs.provider.ProviderFactory.getSharedInstance().getRequestHandlers())
 {
             final RequestHandler provider = rh.getProvider();
             if (WadlGenerator.class.isInstance(provider)) {
                 final WadlGenerator wadlGenerator = 
WadlGenerator.class.cast(provider);
-                wadlGenerator.setIgnoreRequests(false);
+
+                if 
("false".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreRequests",
 "false"))) {
+                    wadlGenerator.setIgnoreRequests(false);
+                }
+                // CXF-5319: bug in CXF? it prevents to get the wadl as json 
otherwise
+                if 
("true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreMessageWriters",
 "false"))) {
+                    wadlGenerator.setIgnoreMessageWriters(false);
+                }
             }
         }
     }