Quantcast

cxf git commit: Fixing 3.0.x build failure

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

cxf git commit: Fixing 3.0.x build failure

sergeyb
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5356ca1d7 -> 21f8d00c0


Fixing 3.0.x build failure


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/21f8d00c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21f8d00c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21f8d00c

Branch: refs/heads/3.0.x-fixes
Commit: 21f8d00c0c983aa12cb7356e555283130a17fc74
Parents: 5356ca1
Author: Sergey Beryozkin <[hidden email]>
Authored: Fri Feb 17 15:37:28 2017 +0000
Committer: Sergey Beryozkin <[hidden email]>
Committed: Fri Feb 17 15:37:28 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java   | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/21f8d00c/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index dc4a7c9..ac1c97e 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2219,17 +2219,10 @@ public class WadlGenerator implements ContainerRequestFilter {
         this.convertResourcesToDOM = convertResourcesToDOM;
     }
 
-<<<<<<< HEAD
-=======
-    public void setIncrementNamespacePrefix(boolean incrementNamespacePrefix) {
-        this.incrementNamespacePrefix = incrementNamespacePrefix;
-    }
     public void setJaxbContextProperties(Map<String, Object> jaxbContextProperties) {
         this.jaxbContextProperties = jaxbContextProperties;
     }
 
-
->>>>>>> 99f6606... Adding WadlGenerator jaxbContextProperties, patch from Vjacheslav Borisov applied with minor updates, This closes #238
     private static class SchemaConverter extends DelegatingXMLStreamWriter {
         private static final String SCHEMA_LOCATION = "schemaLocation";
         private final Map<String, String> locsMap;

Loading...