You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/08/27 00:30:31 UTC

svn commit: r1162277 - in /cxf/branches/2.4.x-fixes: ./ maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml

Author: sergeyb
Date: Fri Aug 26 22:30:30 2011
New Revision: 1162277

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

........
  r1162276 | sergeyb | 2011-08-26 23:28:41 +0100 (Fri, 26 Aug 2011) | 1 line
  
  [CXF-3769] Updating the spec
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
    cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 26 22:30:30 2011
@@ -1 +1 @@
-/cxf/trunk:1162268
+/cxf/trunk:1162268,1162276

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

Modified: cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java?rev=1162277&r1=1162276&r2=1162277&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java (original)
+++ cxf/branches/2.4.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java Fri Aug 26 22:30:30 2011
@@ -196,6 +196,7 @@ public class Option {
         destination.setDeleteDirs(getDeleteDirs());
         destination.setDependencies(getDependencies());
         destination.setOutputDir(getOutputDir());
+        destination.setExtraargs(getExtraargs());
     }
     
     

Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml?rev=1162277&r1=1162276&r2=1162277&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml (original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml Fri Aug 26 22:30:30 2011
@@ -129,6 +129,14 @@ Examples:
                 <switch>impl</switch>
             </option>
             
+            <option id="noAddressBinding" maxOccurs="1">
+                <annotation>
+                    Specifies that the generator should not use the address jaxb binding file to map wsa:EndpointReferenceType 
+                    or wsa:EndpointReference to javax.xml.ws.wsaddressing.W3CEndpointReference.
+                </annotation>
+                <switch>noAddressBinding</switch>
+            </option>
+            
 <!-- 
 
 TODO: consider implementing most of the following options