svn commit: r1569107 - in /tomee/tomee/trunk: server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java

[jlmonteiro]

Author: jlmonteiro
Date: Mon Feb 17 20:42:13 2014
New Revision: 1569107

URL: http://svn.apache.org/r1569107
Log:
Providing a more flexible way to override wadl generator for jaxrs

Modified:
    
tomee/tomee/trunk/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
    
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.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=1569107&r1=1569106&r2=1569107&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
 Mon Feb 17 20:42:13 2014
@@ -132,13 +132,15 @@ public class CxfRsHttpListener implement
             final RequestHandler provider = rh.getProvider();
             if (WadlGenerator.class.isInstance(provider)) {
                 final WadlGenerator wadlGenerator = 
WadlGenerator.class.cast(provider);
+                final String ignoreRequests = 
SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreRequests");
+                final String ignoreMessageWriters = 
SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreMessageWriters",
 false);
 
-                if 
("false".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.cxf-rs.wadl-generator.ignoreRequests",
 "false"))) {
-                    wadlGenerator.setIgnoreRequests(false);
+                if (ignoreRequests != null) {
+                    
wadlGenerator.setIgnoreRequests(Boolean.parseBoolean(ignoreRequests));
                 }
                 // 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);
+                if (ignoreMessageWriters != null) {
+                    
wadlGenerator.setIgnoreMessageWriters(Boolean.parseBoolean(ignoreMessageWriters));
                 }
             }
         }

Modified: 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1569107&r1=1569106&r2=1569107&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
 Mon Feb 17 20:42:13 2014
@@ -700,9 +700,16 @@ public class Installer {
                 systemPropertiesWriter.write("# 
javax.persistence.jtaDataSource = \n");
                 systemPropertiesWriter.write("# 
javax.persistence.nonJtaDataSource = \n");
 
+                systemPropertiesWriter.write("#\n");
+                systemPropertiesWriter.write("# Properties for JAS RS\n");
+                systemPropertiesWriter.write("# openejb.jaxrs.application = 
\n");
+                systemPropertiesWriter.write("# openejb.jaxrs.providers.auto = 
\n");
+                systemPropertiesWriter.write("# 
openejb.cxf-rs.wadl-generator.ignoreRequests = false\n");
+                systemPropertiesWriter.write("# 
openejb.cxf-rs.wadl-generator.ignoreMessageWriters = true\n");
+
+                systemPropertiesWriter.write("#\n");
                 systemPropertiesWriter.write("# These properties are only for 
cxf service (SOAP webservices) and TomEE+\n");
                 systemPropertiesWriter.write("# If you don't use special 
tricks and sun default implementation, uncommenting these 4 lines forces TomEE 
to use it without overhead at all = \n");
-                systemPropertiesWriter.write("#\n");
                 systemPropertiesWriter.write("# javax.xml.soap.MessageFactory 
= com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl\n");
                 systemPropertiesWriter.write("# javax.xml.soap.SOAPFactory = 
com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl\n");
                 systemPropertiesWriter.write("# 
javax.xml.soap.SOAPConnectionFactory = 
com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory\n");