svn commit: r1522871 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java

[sergeyb]

Author: sergeyb
Date: Fri Sep 13 11:21:37 2013
New Revision: 1522871

URL: http://svn.apache.org/r1522871
Log:
Merged revisions 1522868 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1522868 | sergeyb | 2013-09-13 12:05:21 +0100 (Fri, 13 Sep 2013) | 1 line
  
  Getting rid of the last two static UriBuilder calls in the client runtime
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1522868

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

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1522871&r1=1522870&r2=1522871&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
 Fri Sep 13 11:21:37 2013
@@ -616,7 +616,7 @@ public abstract class AbstractClient imp
         String baseURIPath = newBaseURI.getRawPath();
         String reqURIPath = requestURI.getRawPath();
         
-        UriBuilder builder = UriBuilder.fromUri(newBaseURI);
+        UriBuilder builder = new UriBuilderImpl().uri(newBaseURI);
         String basePath = reqURIPath.startsWith(baseURIPath) ? baseURIPath : 
getBaseURI().getRawPath(); 
         builder.path(reqURIPath.equals(basePath) ? "" : 
reqURIPath.substring(basePath.length()));
         URI newRequestURI = 
builder.replaceQuery(requestURI.getRawQuery()).build();

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java?rev=1522871&r1=1522870&r2=1522871&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
 Fri Sep 13 11:21:37 2013
@@ -48,7 +48,6 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.PathSegment;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -612,7 +611,7 @@ public class WebClient extends AbstractC
      * @return updated WebClient
      */
     public WebClient path(String path, Object... values) {
-        URI u = 
UriBuilder.fromUri(URI.create("http://tempuri";)).path(path).buildFromEncoded(values);
+        URI u = new 
UriBuilderImpl().uri(URI.create("http://tempuri";)).path(path).buildFromEncoded(values);
         getState().setTemplates(getTemplateParametersMap(new 
URITemplate(path), Arrays.asList(values)));
         return path(u.getRawPath());
     }